some dark theme updates; budgie stylings

Paper/gtk-3.18/_colors.scss

@@ -2,20 +2,20 @@
 // it gets @if ed depending on $variant
 
 // Main definitions
-$base_color: if($variant == 'light', #ffffff, #6a7981);
+$base_color: if($variant == 'light', #ffffff, #455a64);
-$bg_color: if($variant == 'light', #f7f7f7, #4F585C);
+$bg_color: if($variant == 'light', #f7f7f7, #37474f);
-$fg_color: if($variant == 'light', #444, lighten(#e4e6e7, 10%));
+$fg_color: if($variant == 'light', #444, #cfd8dc);
 $text_color: if($variant == 'light', $fg_color, $fg_color);
-$headerbar_bg_color: if($variant == 'light', #546e7a, #3B4245);
+$headerbar_bg_color: if($variant == 'light', #546e7a, darken($base_color, 10%));
 $headerbar_fg_color: if($variant == 'light', #ffffff, transparentize(#ffffff, 0.2));
 
 // Primary colors
-$red: #f34235;
+$red: #F44336;
-$orange: #fe9700;
+$orange: #ff5722;
-$yellow: #fec006;
+$yellow: #f9ce1d;
-$green: #4bae4f;
+$green: #4caf50;
-$blue: #2095f2;
+$blue: #2196f3;
-$purple: #9b26af;
+$purple: #9c27b0;
 
 $selected_fg_color: #ffffff;
 $selected_bg_color: if($variant == 'light', #347D9F, lighten(#347D9F,10%));
@@ -42,7 +42,7 @@ $success_color: if($variant == 'light', $green, darken($green,10%));
 $destructive_color: if($variant == 'light', $red, darken($red,10%));
 $suggested_color: if($variant == 'light', $selected_bg_color, darken($selected_bg_color,10%));
 
-$osd_fg_color: #e4e6e7;
+$osd_fg_color: #cfd8dc;
 $osd_text_color: white;
 $osd_bg_color: transparentize(#202526, 0.2);
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);

Paper/gtk-3.18/apps/_budgie.scss

@@ -2,6 +2,9 @@
 * Budgie *
 **********/
 
+$budgie_panel_bg_color: #263238;
+$budgie_panel_fg_color: #cfd8dc;
+
 @function gtkalpha($c,$a) {
   @return unquote("alpha(#{$c},#{$a})");
 }
@@ -15,17 +18,19 @@ $asset_suffix: if($variant == 'default', '', '-hc');
 
   @each $pos, $b_pos in $pos_list {
     .#{$pos} & {
-      border-#{$b_pos}: 2px solid transparentize($panel_bg_color,1);
+      border-#{$b_pos}: 2px solid transparentize($budgie_panel_bg_color, 1.0);
-      border-#{$pos}: 2px solid transparentize($panel_bg_color,1);
+      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); }
       }
+
       &:hover {
         border-#{$b_pos}: 2px solid transparentize(black, 0.9);
         border-#{$pos}: 2px solid transparentize($selected_bg_color, 0.5);
       }
+
       &:active, &:checked {
         border-#{$b_pos}: 2px solid transparentize(black, 0.8);
         border-#{$pos}: 2px solid $selected_bg_color;
@@ -34,13 +39,21 @@ $asset_suffix: if($variant == 'default', '', '-hc');
   }
 }
 
+// Budgie
+.budgie-container {
+  border: none;
+  box-shadow: none;
+  background: none;
+  font-size: 100%;
+}
+
 // Budgie Menu
 .budgie-menu {
   GtkSearchEntry.entry:not(:selected) {
     border: none;
     box-shadow: none;
     background: none;
-    font-size: 120%;
+    font-size: 100%;
 
     &.image { padding-left: 0px; padding-right: 6px; }
   }
@@ -51,24 +64,13 @@ $asset_suffix: if($variant == 'default', '', '-hc');
 // Panel
 .budgie-panel {
   font: bold;
-  color: $panel_fg_color;
+  font-size: 100%;
-  background-color: $panel_bg_color;
+  color: $budgie_panel_fg_color;
+  background-color: $budgie_panel_bg_color;
 
   &:backdrop {
-    color: $panel_fg_color;
+    color: $budgie_panel_fg_color;
-    background-color: $panel_bg_color;
+    background-color: $budgie_panel_bg_color;
-  }
-
-  // End Section needs to be fancy
-  @if $variant == 'default' {
-    .end-region {
-      background-color: rgba(0,0,0,0.3);
-      border-radius: 2px;
-
-      .separator {
-        color: transparentize($panel_fg_color, 0.85)
-      }
-    }
   }
 
   // Tasklist
@@ -79,7 +81,7 @@ $asset_suffix: if($variant == 'default', '', '-hc');
       border-radius: 0;
 
       @if $variant == 'default' {
-        &:not(:hover):not(:active):not(:checked) { color: gtkalpha(currentColor, 0.5); }
+        // &:not(:hover):not(:active):not(:checked) { color: gtkalpha(currentColor, 0.5); }
         background: none;
         background-clip: padding-box;
         border: none;
@@ -91,10 +93,10 @@ $asset_suffix: if($variant == 'default', '', '-hc');
 
   // Icon Tasklist
   .launcher {
-    transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    // transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
     padding-left: 2px;
     padding-right: 2px;
-    border-color: transparentize($panel_bg_color,1); // fixes the transition
+    border-color: transparentize($budgie_panel_bg_color, 1.0); // fixes the transition
 
     &:hover { -gtk-image-effect: highlight; }
   }
@@ -117,14 +119,15 @@ $asset_suffix: if($variant == 'default', '', '-hc');
 @each $pos, $b_pos in $pos_list {
 
   // Panel borders
-  .#{$pos} .budgie-panel { border-#{$b_pos}: 1px solid $panel_borders_color; }
+  .#{$pos} .budgie-panel {
+    border-#{$b_pos}: 1px solid transparentize(black,0.8);
+    box-shadow:none;
+  }
 
   // Raven borders
   .#{$pos} .raven-frame {
-    padding: 0;
+    border-#{$b_pos}: 1px solid transparentize(black, 0.2);
-    background: none;
+    box-shadow:inset 0 0 0 1px transparentize(white, 0.7);
-    border: none;
-    border-#{$b_pos}: 1px solid transparentize(black, 0.8);
   }
 
   // Shadows
@@ -137,14 +140,18 @@ $asset_suffix: if($variant == 'default', '', '-hc');
 }
 
 // Raven
+
 .raven {
-  color: $panel_fg_color;
+  color: $fg_color;
-  background-color: transparentize($panel_bg_color, 0.8);
+  background-color: transparentize($bg_color, 0.02);
   transition: 170ms ease-out;
 
   .raven-header {
-    color: $panel_fg_color;
+    background-color: $bg_color;
-    border-width: 1px 0;
+    color: $fg_color;
+    border-top: 1px solid $borders_color;
+    border-bottom: 1px solid $borders_color;
+    box-shadow:inset 0 1px 0 0 transparentize(white,0.9), 0 1px 1px 0 transparentize(black,0.9);
 
     &.top { border-top-style: none; }
     &.bottom { border-bottom-style: none; }
@@ -155,15 +162,33 @@ $asset_suffix: if($variant == 'default', '', '-hc');
   }
 
   .raven-background {
-    color: $panel_fg_color;
+    background-color: $base_color;
-    background-color: transparentize($panel_bg_color, 0.8);
+    border-bottom: 1px solid $borders_color;
-    border-bottom: 1px solid transparentize($panel_borders_color, 0.8);
+    box-shadow:inset 0 1px 0 0 transparentize(white,0.9), 0 1px 1px 0 transparentize(black,0.9);
 
     &.middle { border-bottom-style: none; }  // applet background between two headers
   }
 
+  .powerstrip {
+    background-color: transparent;
+    border: none;
+    box-shadow:none;
+  }
+
   .powerstrip .button {
-    padding: 10px;
+    border-radius:50%;
+    padding: 12px;
+    background: transparentize(black,0.9);
+    border: 1px solid transparentize(black,0.8);
+    box-shadow: 0 1px transparentize(white,0.9);
+    font-size: 100%;
+
+    &:hover {
+      background: transparentize(black,0.9);
+      border: 1px solid transparentize(black,0.8);
+      box-shadow: inset 0 1px transparentize(white,0.9), 1px 1px transparentize(black,0.8);
+      transition: 170ms ease all;
+    }
   }
 
   .option-subtitle {
@@ -183,7 +208,6 @@ $asset_suffix: if($variant == 'default', '', '-hc');
 
 // Notifications
 .budgie-notification-window {
-  background: none;
   border-radius: 1px;
 }
 
@@ -198,24 +222,26 @@ $asset_suffix: if($variant == 'default', '', '-hc');
     color: $fg_color;
   }
 
-  .notification-body { color: transparentize($panel_fg_color, 0.3); }
+  .notification-body { color: transparentize($budgie_panel_fg_color, 0.3); }
 }
 
 .drop-shadow {
-  background-color: transparent;
+  box-shadow: 0 1px 1px 0 $shadow_color;
-  box-shadow: 0 2px 4px 0 $shadow_color, 0 0 0 1px $panel_borders_color;
-  border-radius: 1px;
 }
 
 // Session Dialog
 .budgie-session-dialog {
+  padding:12px;
+  border-radius: 4px;
+  border:none;
+  border-top: 1px solid transparentize(white,0.9);
   &.background { @extend .drop-shadow; }
 
   .linked.horizontal > .button {
     border-bottom: none;
     border-radius: 0;
-    &:first-child { border-left: none; border-radius: 0; }
+    &:first-child { border-left: none; border-radius: 0 0 0 4px; }
-    &:last-child { border-right: none; border-radius: 0; }
+    &:last-child { border-right: none; border-radius: 0 0 4px 0; }
   }
 }
 
@@ -223,6 +249,6 @@ $asset_suffix: if($variant == 'default', '', '-hc');
 .budgie-polkit-dialog {
   @extend .budgie-session-dialog;
 
-  .message { color: transparentize($panel_fg_color, 0.3); }
+  .message { color: transparentize($budgie_panel_fg_color, 0.3); }
   .failure { color: $red; }
 }

Paper/gtk-3.18/gtk.css

@@ -53,9 +53,9 @@
 /* widgets main borders color on backdrop windows */
 @define-color unfocused_borders #d5d5d5;
 /* these are pretty self explicative */
-@define-color warning_color #fec006;
+@define-color warning_color #f9ce1d;
-@define-color error_color #f34235;
+@define-color error_color #F44336;
-@define-color success_color #4bae4f;
+@define-color success_color #4caf50;
 /* these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#444, 1.8);
@@ -78,7 +78,7 @@ read if you used those and something break with a version upgrade you're on your
 * {
   padding: 0;
   -GtkToolButton-icon-spacing: 4;
-  -GtkTextView-error-underline-color: #f34235;
+  -GtkTextView-error-underline-color: #F44336;
   -GtkScrolledWindow-scrollbar-spacing: 0;
   -GtkToolItemGroup-expander-size: 11;
   -GtkTreeView-expander-size: 11;
@@ -239,11 +239,11 @@ GtkLabel:backdrop {
 .app-notification,
 .app-notification.frame, .osd .scale-popup, .csd .popover .background.touch-selection, .csd .popover .background.magnifier, .popover .background.touch-selection, .popover .background.magnifier, .csd .popover .background.osd, .popover .background.osd,
 .osd {
-  color: #e4e6e7;
+  color: #cfd8dc;
   border: none;
   background-color: rgba(32, 37, 38, 0.8);
   background-clip: padding-box;
-  outline-color: rgba(228, 230, 231, 0.3);
+  outline-color: rgba(207, 216, 220, 0.3);
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black; }
   .app-notification:backdrop, .osd .scale-popup:backdrop, .popover .background.touch-selection:backdrop, .popover .background.magnifier:backdrop, .popover .background.osd:backdrop,
@@ -476,17 +476,17 @@ row:selected
     .button.flat:not(:active):not(:checked):not(:hover):not(disabled):backdrop {
       color: #fcfcfc; }
 .button.osd {
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-radius: 5px;
-  outline-color: rgba(228, 230, 231, 0.3);
+  outline-color: rgba(207, 216, 220, 0.3);
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-color: rgba(0, 0, 0, 0.7);
   background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black;
-  outline-color: rgba(228, 230, 231, 0.3);
+  outline-color: rgba(207, 216, 220, 0.3);
   border: none;
   box-shadow: none; }
   .button.osd:hover {
@@ -497,7 +497,7 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3);
+    outline-color: rgba(207, 216, 220, 0.3);
     border: none;
     box-shadow: none; }
   .button.osd:active,
@@ -509,23 +509,23 @@ row:selected
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
-    outline-color: rgba(228, 230, 231, 0.3);
+    outline-color: rgba(207, 216, 220, 0.3);
     border: none;
     box-shadow: none; }
   .button.osd:insensitive:backdrop,
   .button.osd:insensitive,
   .button.osd:insensitive:backdrop,
   .button.osd:insensitive {
-    color: #828687;
+    color: #787f81;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
     border: none; }
   .button.osd:backdrop {
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
     background-clip: padding-box;
@@ -537,14 +537,14 @@ row:selected
 .app-notification.frame .button,
 .app-notification.frame button, .csd .popover .background.touch-selection button, .csd .popover .background.magnifier button, .popover .background.touch-selection button, .popover .background.magnifier button, .osd
 .button {
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-color: rgba(0, 0, 0, 0.7);
   background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black;
-  outline-color: rgba(228, 230, 231, 0.3); }
+  outline-color: rgba(207, 216, 220, 0.3); }
   .app-notification .button:hover, .app-notification button:hover, .popover .background.touch-selection button:hover, .popover .background.magnifier button:hover, .osd
   .button:hover {
     color: white;
@@ -554,7 +554,7 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   .app-notification .button:active:backdrop, .app-notification button:active:backdrop, .popover .background.touch-selection button:active:backdrop, .popover .background.magnifier button:active:backdrop, .app-notification .button:active, .app-notification button:active, .popover .background.touch-selection button:active, .popover .background.magnifier button:active, .app-notification .button:checked:backdrop, .app-notification button:checked:backdrop, .popover .background.touch-selection button:checked:backdrop, .popover .background.magnifier button:checked:backdrop, .app-notification .button:checked, .app-notification button:checked, .popover .background.touch-selection button:checked, .popover .background.magnifier button:checked, .osd
   .button:active:backdrop, .osd
   .button:active, .osd
@@ -567,20 +567,20 @@ row:selected
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   .app-notification .button:insensitive:backdrop, .app-notification button:insensitive:backdrop, .popover .background.touch-selection button:insensitive:backdrop, .popover .background.magnifier button:insensitive:backdrop, .app-notification .button:insensitive, .app-notification button:insensitive, .popover .background.touch-selection button:insensitive, .popover .background.magnifier button:insensitive, .osd
   .button:insensitive:backdrop, .osd
   .button:insensitive {
-    color: #828687;
+    color: #787f81;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none; }
   .app-notification .button:backdrop, .app-notification button:backdrop, .popover .background.touch-selection button:backdrop, .popover .background.magnifier button:backdrop, .osd
   .button:backdrop {
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
     background-clip: padding-box;
@@ -605,12 +605,12 @@ row:selected
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
     .app-notification .flat.button:insensitive, .app-notification button.flat:insensitive, .popover .background.touch-selection button.flat:insensitive, .popover .background.magnifier button.flat:insensitive, .osd
     .button.flat:insensitive {
-      color: #828687;
+      color: #787f81;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -636,7 +636,7 @@ row:selected
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
 .button.suggested-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.3);
@@ -769,14 +769,14 @@ row:selected
         color: #b7cdd7; }
   .osd
   .button.suggested-action {
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(52, 125, 159, 0.5));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     .button.suggested-action:hover {
       color: white;
@@ -786,7 +786,7 @@ row:selected
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     .button.suggested-action:active:backdrop, .osd
     .button.suggested-action:active, .osd
@@ -799,20 +799,20 @@ row:selected
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     .button.suggested-action:insensitive:backdrop, .osd
     .button.suggested-action:insensitive {
-      color: #828687;
+      color: #787f81;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
     .osd
     .button.suggested-action:backdrop {
-      color: #e4e6e7;
+      color: #cfd8dc;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(52, 125, 159, 0.5));
       background-clip: padding-box;
@@ -822,8 +822,8 @@ row:selected
 .button.destructive-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.3);
-  border-color: #9f1409;
+  border-color: #a21309;
-  background-image: linear-gradient(to bottom, #f34235, #f22b1d);
+  background-image: linear-gradient(to bottom, #F44336, #f32c1e);
   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);
@@ -835,12 +835,12 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #f34235; }
+    color: #F44336; }
   .button.destructive-action:hover {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #9f1409;
+    border-color: #a21309;
-    background-image: linear-gradient(to bottom, #f55d52, #f34235 60%, #f23022);
+    background-image: linear-gradient(to bottom, #f65e53, #F44336 60%, #f33123);
     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); }
@@ -848,16 +848,16 @@ row:selected
   .button.destructive-action:checked {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #9f1409;
+    border-color: #a21309;
-    background-image: linear-gradient(to bottom, #f12213, #f2392b);
+    background-image: linear-gradient(to bottom, #f22314, #f33a2c);
     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.destructive-action:backdrop,
   .button.destructive-action.flat:backdrop {
-    border-color: #f34235;
+    border-color: #F44336;
-    background-image: linear-gradient(to bottom, #f34235);
+    background-image: linear-gradient(to bottom, #F44336);
     text-shadow: none;
     icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -870,7 +870,7 @@ row:selected
     .button.destructive-action:backdrop:checked,
     .button.destructive-action.flat:backdrop:active,
     .button.destructive-action.flat:backdrop:checked {
-      border-color: #e71d0e;
+      border-color: #ea1c0d;
       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.destructive-action:backdrop:active GtkLabel,
@@ -881,7 +881,7 @@ row:selected
       .button.destructive-action.flat:backdrop:active,
       .button.destructive-action.flat:backdrop:checked GtkLabel,
       .button.destructive-action.flat:backdrop:checked {
-        color: #fad2cf; }
+        color: #fbd2cf; }
       .button.destructive-action:backdrop:active label,
       .button.destructive-action:backdrop:active,
       .button.destructive-action:backdrop:checked label,
@@ -890,7 +890,7 @@ row:selected
       .button.destructive-action.flat:backdrop:active,
       .button.destructive-action.flat:backdrop:checked label,
       .button.destructive-action.flat:backdrop:checked {
-        color: #fad2cf; }
+        color: #fbd2cf; }
     .button.destructive-action:backdrop:insensitive,
     .button.destructive-action.flat:backdrop:insensitive {
       border-color: #d5d5d5;
@@ -908,15 +908,15 @@ row:selected
       .button.destructive-action:backdrop:insensitive:checked,
       .button.destructive-action.flat:backdrop:insensitive:active,
       .button.destructive-action.flat:backdrop:insensitive:checked {
-        border-color: #f4473b;
+        border-color: #f5483c;
         background-image: none;
-        background-color: #f4473b;
+        background-color: #f5483c;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
         .button.destructive-action:backdrop:insensitive:active GtkLabel,
         .button.destructive-action:backdrop:insensitive:checked GtkLabel,
         .button.destructive-action.flat:backdrop:insensitive:active GtkLabel,
         .button.destructive-action.flat:backdrop:insensitive:checked GtkLabel {
-          color: #f88780; }
+          color: #f98880; }
   .button.destructive-action.flat:backdrop,
   .button.destructive-action.flat:insensitive,
   .button.destructive-action.flat:backdrop:insensitive {
@@ -926,7 +926,7 @@ row:selected
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: rgba(243, 66, 53, 0.8); }
+    color: rgba(244, 67, 54, 0.8); }
   .button.destructive-action:insensitive {
     border-color: #d1d1d1;
     background-image: none;
@@ -939,36 +939,36 @@ row:selected
       color: #9e9e9e; }
     .button.destructive-action:insensitive:active,
     .button.destructive-action:insensitive:checked {
-      border-color: #9f1409;
+      border-color: #a21309;
       background-image: none;
-      background-color: #f4473b;
+      background-color: #f5483c;
       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.destructive-action:insensitive:active GtkLabel,
       .button.destructive-action:insensitive:active,
       .button.destructive-action:insensitive:checked GtkLabel,
       .button.destructive-action:insensitive:checked {
-        color: #fbb5b1; }
+        color: #fbb6b1; }
   .osd
   .button.destructive-action {
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(243, 66, 53, 0.5));
+    background-image: linear-gradient(to bottom, rgba(244, 67, 54, 0.5));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     .button.destructive-action:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(243, 66, 53, 0.7));
+      background-image: linear-gradient(to bottom, rgba(244, 67, 54, 0.7));
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     .button.destructive-action:active:backdrop, .osd
     .button.destructive-action:active, .osd
@@ -976,27 +976,27 @@ row:selected
     .button.destructive-action:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, #f34235);
+      background-image: linear-gradient(to bottom, #F44336);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     .button.destructive-action:insensitive:backdrop, .osd
     .button.destructive-action:insensitive {
-      color: #828687;
+      color: #787f81;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       icon-shadow: none; }
     .osd
     .button.destructive-action:backdrop {
-      color: #e4e6e7;
+      color: #cfd8dc;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(243, 66, 53, 0.5));
+      background-image: linear-gradient(to bottom, rgba(244, 67, 54, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -2044,28 +2044,28 @@ GtkFileChooserDialog {
     box-shadow: none; }
   .error.spinbutton:not(.vertical), GeditWindow > .error.entry,
   .entry.error {
-    color: #f34235;
+    color: #F44336;
-    border-color: #f34235; }
+    border-color: #F44336; }
     .error.spinbutton:focus:not(.vertical), GeditWindow > .error.entry:focus,
     .entry.error: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: #f34235; }
+      border-color: #F44336; }
     .error.spinbutton:selected:focus:not(.vertical), GeditWindow > .error.entry:selected:focus, .error.spinbutton:selected:not(.vertical), GeditWindow > .error.entry:selected,
     .entry.error:selected:focus,
     .entry.error:selected {
-      background-color: #f34235; }
+      background-color: #F44336; }
   .warning.spinbutton:not(.vertical), GeditWindow > .warning.entry,
   .entry.warning {
-    color: #fec006;
+    color: #f9ce1d;
-    border-color: #fec006; }
+    border-color: #f9ce1d; }
     .warning.spinbutton:focus:not(.vertical), GeditWindow > .warning.entry:focus,
     .entry.warning: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: #fec006; }
+      border-color: #f9ce1d; }
     .warning.spinbutton:selected:focus:not(.vertical), GeditWindow > .warning.entry:selected:focus, .warning.spinbutton:selected:not(.vertical), GeditWindow > .warning.entry:selected,
     .entry.warning:selected:focus,
     .entry.warning:selected {
-      background-color: #fec006; }
+      background-color: #f9ce1d; }
 .spinbutton:not(.vertical) .progressbar, GeditWindow > .entry .progressbar,
 .entry .progressbar {
   margin: 2px -6px;
@@ -2418,7 +2418,7 @@ GraniteWidgetsWelcome {
   background-color: transparent;
   padding: 8px 6px; }
 .storage-bar .fill-block {
-  background-color: #fec006;
+  background-color: #f9ce1d;
   border: none;
   box-shadow: inset 0 1px 0 0 rgba(0, 0, 0, 0.1), inset 0 -1px 0 0 rgba(0, 0, 0, 0.1);
   transition: all 200ms ease-in-out;
@@ -2435,13 +2435,13 @@ GraniteWidgetsWelcome {
   .storage-bar .fill-block.empty-block {
     background-color: #ffffff; }
   .storage-bar .fill-block.app {
-    background-color: #2095f2; }
+    background-color: #2196f3; }
   .storage-bar .fill-block.audio {
-    background-color: #fe9700; }
+    background-color: #ff5722; }
   .storage-bar .fill-block.photo {
-    background-color: #f34235; }
+    background-color: #F44336; }
   .storage-bar .fill-block.video {
-    background-color: #9b26af; }
+    background-color: #9c27b0; }
   .storage-bar .fill-block .legend {
     padding: 12px;
     border-radius: 4px; }
@@ -2906,27 +2906,27 @@ infobar {
       box-shadow: none; }
 
 .info {
-  background-color: #2095f2; }
+  background-color: #2196f3; }
   .info:backdrop {
-    background-color: #50acf5;
+    background-color: #51adf6;
     color: rgba(255, 255, 255, 0.5); }
 
 .warning {
-  background-color: #fec006; }
+  background-color: #f9ce1d; }
   .warning:backdrop {
-    background-color: #fecd39;
+    background-color: #fad94f;
     color: rgba(255, 255, 255, 0.5); }
 
 .question {
-  background-color: #4bae4f; }
+  background-color: #4caf50; }
   .question:backdrop {
-    background-color: #6cc070;
+    background-color: #6ec071;
     color: rgba(255, 255, 255, 0.5); }
 
 .error {
-  background-color: #f34235; }
+  background-color: #F44336; }
   .error:backdrop {
-    background-color: #f66f65;
+    background-color: #f77066;
     color: rgba(255, 255, 255, 0.5); }
 
 /*************
@@ -2980,8 +2980,8 @@ GtkLevelBar,
     .level-bar.vertical .level-low.fill-block,
     .level-bar .fill-block.low,
     .level-bar .fill-block.level-low {
-      border: 1px solid #d09c01;
+      border: 1px solid #ddb306;
-      background-color: #fec006; }
+      background-color: #f9ce1d; }
       GtkLevelBar.vertical .low.fill-block:backdrop,
       GtkLevelBar .level-bar.vertical .low.fill-block:backdrop,
       .level-bar.vertical GtkLevelBar .low.fill-block:backdrop, GtkLevelBar.vertical .level-low.fill-block:backdrop,
@@ -2997,7 +2997,7 @@ GtkLevelBar,
       .level-bar.vertical .level-low.fill-block:backdrop,
       .level-bar .fill-block.low:backdrop,
       .level-bar .fill-block.level-low:backdrop {
-        border: 1px solid #fec006; }
+        border: 1px solid #f9ce1d; }
     GtkLevelBar.vertical .high.fill-block,
     GtkLevelBar .level-bar.vertical .high.fill-block,
     .level-bar.vertical GtkLevelBar .high.fill-block, GtkLevelBar.vertical .level-high.fill-block,
@@ -3046,8 +3046,8 @@ GtkLevelBar,
     .level-bar.vertical .level-full.fill-block,
     .level-bar .fill-block.full,
     .level-bar .fill-block.level-full {
-      border: 1px solid #3c8a3f;
+      border: 1px solid #3d8b40;
-      background-color: #4bae4f; }
+      background-color: #4caf50; }
       GtkLevelBar.vertical .full.fill-block:backdrop,
       GtkLevelBar .level-bar.vertical .full.fill-block:backdrop,
       .level-bar.vertical GtkLevelBar .full.fill-block:backdrop, GtkLevelBar.vertical .level-full.fill-block:backdrop,
@@ -3063,7 +3063,7 @@ GtkLevelBar,
       .level-bar.vertical .level-full.fill-block:backdrop,
       .level-bar .fill-block.full:backdrop,
       .level-bar .fill-block.level-full:backdrop {
-        border: 1px solid #4bae4f; }
+        border: 1px solid #4caf50; }
     GtkLevelBar.vertical .empty.fill-block,
     GtkLevelBar .level-bar.vertical .empty.fill-block,
     .level-bar.vertical GtkLevelBar .empty.fill-block, GtkLevelBar.vertical .level-empty.fill-block,
@@ -3638,12 +3638,12 @@ GtkLevelBar .trough,
     border-color: rgba(0, 0, 0, 0.7);
     background-color: rgba(0, 0, 0, 0.5);
     box-shadow: none;
-    outline-color: rgba(228, 230, 231, 0.2); }
+    outline-color: rgba(207, 216, 220, 0.2); }
     .osd GtkLevelBar .trough:insensitive, GtkLevelBar .osd .trough:insensitive,
     .osd .level-bar .trough:insensitive,
     .level-bar .osd .trough:insensitive, .osd GtkProgressBar:insensitive,
     .osd .progressbar:insensitive, .osd .scale .trough:insensitive, .scale .osd .trough:insensitive, .osd .scale fill:insensitive, .scale .osd fill:insensitive {
-      background-color: rgba(52, 56, 57, 0.5); }
+      background-color: rgba(50, 55, 56, 0.5); }
 
 GtkProgressBar .progressbar,
 .progressbar .progressbar, .scale .highlight, .scale.fine-tune .highlight {
@@ -3722,14 +3722,14 @@ GtkProgressBar .progressbar,
     row:selected .scale .slider, row:selected .scale .slider:insensitive {
       border-color: #275f79; }
     .osd .scale .slider {
-      color: #e4e6e7;
+      color: #cfd8dc;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       icon-shadow: 0 1px black;
-      outline-color: rgba(228, 230, 231, 0.3);
+      outline-color: rgba(207, 216, 220, 0.3);
       border-color: rgba(0, 0, 0, 0.7);
       background-color: #202526; }
       .osd .scale .slider:hover {
@@ -3740,7 +3740,7 @@ GtkProgressBar .progressbar,
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
         icon-shadow: 0 1px black;
-        outline-color: rgba(228, 230, 231, 0.3); }
+        outline-color: rgba(207, 216, 220, 0.3); }
       .osd .scale .slider:active {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
@@ -3749,17 +3749,17 @@ GtkProgressBar .progressbar,
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none;
-        outline-color: rgba(228, 230, 231, 0.3); }
+        outline-color: rgba(207, 216, 220, 0.3); }
       .osd .scale .slider:insensitive {
-        color: #828687;
+        color: #787f81;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         icon-shadow: none; }
       .osd .scale .slider:backdrop {
-        color: #e4e6e7;
+        color: #cfd8dc;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
         background-clip: padding-box;
@@ -3797,7 +3797,7 @@ GtkProgressBar .progressbar,
       border-color: transparent;
       background-color: transparent; }
     .osd .scale fill {
-      background-color: rgba(87, 88, 88, 0.775); }
+      background-color: rgba(79, 83, 84, 0.775); }
       .osd .scale fill:insensitive, .osd .scale fill:insensitive:backdrop {
         border-color: transparent;
         background-color: transparent; }
@@ -4085,7 +4085,7 @@ OsScrollbar {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0);
   text-shadow: none;
   icon-shadow: none;
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-style: none none none solid;
   border-color: rgba(0, 0, 0, 0.4);
   border-radius: 0;
@@ -4099,9 +4099,9 @@ OsScrollbar {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.5);
-    background-color: rgba(228, 230, 231, 0.1);
+    background-color: rgba(207, 216, 220, 0.1);
     box-shadow: none; }
   .osd .spinbutton:not(.vertical) .button:backdrop {
     border-color: transparent;
@@ -4110,7 +4110,7 @@ OsScrollbar {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.5);
     box-shadow: none; }
   .osd .spinbutton:not(.vertical) .button:insensitive {
@@ -4120,7 +4120,7 @@ OsScrollbar {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     icon-shadow: none;
-    color: #828687;
+    color: #787f81;
     border-color: rgba(0, 0, 0, 0.5);
     box-shadow: none; }
   .osd .spinbutton:not(.vertical) .button:last-child {
@@ -4154,14 +4154,14 @@ OsScrollbar {
   border-radius: 0 0 3px 3px;
   border-style: none solid solid solid; }
 .osd .spinbutton.vertical button:first-child {
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-color: rgba(0, 0, 0, 0.7);
   background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black;
-  outline-color: rgba(228, 230, 231, 0.3); }
+  outline-color: rgba(207, 216, 220, 0.3); }
   .osd .spinbutton.vertical button:first-child:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -4170,7 +4170,7 @@ OsScrollbar {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   .osd .spinbutton.vertical button:first-child:active {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -4179,17 +4179,17 @@ OsScrollbar {
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   .osd .spinbutton.vertical button:first-child:insensitive {
-    color: #828687;
+    color: #787f81;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none; }
   .osd .spinbutton.vertical button:first-child:backdrop {
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
     background-clip: padding-box;
@@ -4248,9 +4248,9 @@ GtkSwitch {
   border-radius: 14px;
   color: transparent;
   background-color: rgba(0, 0, 0, 0.1);
-  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.05), 0px 1px rgba(255, 255, 255, 0.3); }
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.2), 0px 1px rgba(255, 255, 255, 0.3); }
   GtkSwitch:insensitive {
-    background-color: #fafafa; }
+    background-color: rgba(0, 0, 0, 0.1); }
   GtkSwitch:backdrop {
     background-color: #f7f7f7;
     transition: 200ms ease-out; }
@@ -4264,18 +4264,18 @@ GtkSwitch {
       GtkSwitch:active:backdrop slider:backdrop, GtkSwitch:checked:backdrop .slider:backdrop,
       GtkSwitch:checked:backdrop slider:backdrop {
         box-shadow: none;
-        background-color: rgba(255, 255, 255, 0.9);
+        background-color: rgba(247, 247, 247, 0.9);
         border: none; }
   GtkSwitch .slider {
     padding: 2px;
     border-radius: 50%;
     transition: all 200ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
-    background-color: #ffffff;
+    background-color: #f7f7f7;
     box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2), 0 1px 2px rgba(0, 0, 0, 0.2); }
     GtkSwitch .slider:backdrop {
-      padding: 2px;
+      box-shadow: none; }
-      box-shadow: none;
+    GtkSwitch .slider:insensitive {
-      background-color: #ffffff; }
+      box-shadow: none; }
   GtkSwitch .trough:active, GtkSwitch .trough:checked {
     background-color: #347D9F; }
     GtkSwitch .trough:active:backdrop, GtkSwitch .trough:checked:backdrop {
@@ -4889,8 +4889,8 @@ treeview.view header button:active {
 .budgie-panel .unpinned .launcher:active, .budgie-panel .pinned .launcher.running:active, .budgie-panel .unpinned .launcher:checked, .budgie-panel .pinned .launcher.running:checked {
   background-color: rgba(0, 0, 0, 0.2); }
 .top .budgie-panel .unpinned .launcher, .budgie-panel .unpinned .top .launcher, .top .budgie-panel .pinned .launcher.running, .budgie-panel .pinned .top .launcher.running {
-  border-bottom: 2px solid transparent;
+  border-bottom: 2px solid rgba(38, 50, 56, 0);
-  border-top: 2px solid transparent; }
+  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(52, 125, 159, 0.5); }
@@ -4901,8 +4901,8 @@ treeview.view header button:active {
     border-bottom: 2px solid rgba(0, 0, 0, 0.2);
     border-top: 2px solid #347D9F; }
 .bottom .budgie-panel .unpinned .launcher, .budgie-panel .unpinned .bottom .launcher, .bottom .budgie-panel .pinned .launcher.running, .budgie-panel .pinned .bottom .launcher.running {
-  border-top: 2px solid transparent;
+  border-top: 2px solid rgba(38, 50, 56, 0);
-  border-bottom: 2px solid transparent; }
+  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(52, 125, 159, 0.5); }
@@ -4913,8 +4913,8 @@ treeview.view header button:active {
     border-top: 2px solid rgba(0, 0, 0, 0.2);
     border-bottom: 2px solid #347D9F; }
 .left .budgie-panel .unpinned .launcher, .budgie-panel .unpinned .left .launcher, .left .budgie-panel .pinned .launcher.running, .budgie-panel .pinned .left .launcher.running {
-  border-right: 2px solid transparent;
+  border-right: 2px solid rgba(38, 50, 56, 0);
-  border-left: 2px solid transparent; }
+  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(52, 125, 159, 0.5); }
@@ -4925,8 +4925,8 @@ treeview.view header button:active {
     border-right: 2px solid rgba(0, 0, 0, 0.2);
     border-left: 2px solid #347D9F; }
 .right .budgie-panel .unpinned .launcher, .budgie-panel .unpinned .right .launcher, .right .budgie-panel .pinned .launcher.running, .budgie-panel .pinned .right .launcher.running {
-  border-left: 2px solid transparent;
+  border-left: 2px solid rgba(38, 50, 56, 0);
-  border-right: 2px solid transparent; }
+  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(52, 125, 159, 0.5); }
@@ -4937,11 +4937,17 @@ treeview.view header button:active {
     border-left: 2px solid rgba(0, 0, 0, 0.2);
     border-right: 2px solid #347D9F; }
 
+.budgie-container {
+  border: none;
+  box-shadow: none;
+  background: none;
+  font-size: 100%; }
+
 .budgie-menu GtkSearchEntry.entry:not(:selected) {
   border: none;
   box-shadow: none;
   background: none;
-  font-size: 120%; }
+  font-size: 100%; }
   .budgie-menu GtkSearchEntry.entry:not(:selected).image {
     padding-left: 0px;
     padding-right: 6px; }
@@ -4951,93 +4957,106 @@ treeview.view header button:active {
 
 .budgie-panel {
   font: bold;
-  color: white;
+  font-size: 100%;
-  background-color: rgba(0, 0, 0, 0.7); }
+  color: #cfd8dc;
+  background-color: #263238; }
   .budgie-panel:backdrop {
-    color: white;
+    color: #cfd8dc;
-    background-color: rgba(0, 0, 0, 0.7); }
+    background-color: #263238; }
   .budgie-panel WnckTasklist .button,
   .budgie-panel WnckTasklist .button:backdrop {
     border-radius: 0; }
   .budgie-panel .launcher {
-    transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
     padding-left: 2px;
     padding-right: 2px;
-    border-color: transparent; }
+    border-color: rgba(38, 50, 56, 0); }
     .budgie-panel .launcher:hover {
       -gtk-image-effect: highlight; }
 
 .top .budgie-panel {
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2); }
+  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none; }
 
 .top .raven-frame {
-  padding: 0;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.8);
-  background: none;
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3); }
-  border: none;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.2); }
 
 .top .shadow-block {
   background-color: transparent;
   background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent); }
 
 .bottom .budgie-panel {
-  border-top: 1px solid rgba(0, 0, 0, 0.2); }
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none; }
 
 .bottom .raven-frame {
-  padding: 0;
+  border-top: 1px solid rgba(0, 0, 0, 0.8);
-  background: none;
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3); }
-  border: none;
-  border-top: 1px solid rgba(0, 0, 0, 0.2); }
 
 .bottom .shadow-block {
   background-color: transparent;
   background-image: linear-gradient(to top, rgba(0, 0, 0, 0.2), transparent); }
 
 .left .budgie-panel {
-  border-right: 1px solid rgba(0, 0, 0, 0.2); }
+  border-right: 1px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none; }
 
 .left .raven-frame {
-  padding: 0;
+  border-right: 1px solid rgba(0, 0, 0, 0.8);
-  background: none;
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3); }
-  border: none;
-  border-right: 1px solid rgba(0, 0, 0, 0.2); }
 
 .left .shadow-block {
   background-color: transparent;
   background-image: linear-gradient(to right, rgba(0, 0, 0, 0.2), transparent); }
 
 .right .budgie-panel {
-  border-left: 1px solid rgba(0, 0, 0, 0.2); }
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none; }
 
 .right .raven-frame {
-  padding: 0;
+  border-left: 1px solid rgba(0, 0, 0, 0.8);
-  background: none;
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3); }
-  border: none;
-  border-left: 1px solid rgba(0, 0, 0, 0.2); }
 
 .right .shadow-block {
   background-color: transparent;
   background-image: linear-gradient(to left, rgba(0, 0, 0, 0.2), transparent); }
 
 .raven {
-  color: white;
+  color: #444;
-  background-color: transparent;
+  background-color: rgba(247, 247, 247, 0.98);
   transition: 170ms ease-out; }
   .raven .raven-header {
-    color: white;
+    background-color: #f7f7f7;
-    border-width: 1px 0; }
+    color: #444;
+    border-top: 1px solid #d1d1d1;
+    border-bottom: 1px solid #d1d1d1;
+    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.1); }
     .raven .raven-header.top {
       border-top-style: none; }
     .raven .raven-header.bottom {
       border-bottom-style: none; }
   .raven .raven-background {
-    color: white;
+    background-color: #ffffff;
-    background-color: transparent;
+    border-bottom: 1px solid #d1d1d1;
-    border-bottom: 1px solid transparent; }
+    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.1); }
     .raven .raven-background.middle {
       border-bottom-style: none; }
+  .raven .powerstrip {
+    background-color: transparent;
+    border: none;
+    box-shadow: none; }
   .raven .powerstrip .button {
-    padding: 10px; }
+    border-radius: 50%;
+    padding: 12px;
+    background: rgba(0, 0, 0, 0.1);
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px rgba(255, 255, 255, 0.1);
+    font-size: 100%; }
+    .raven .powerstrip .button:hover {
+      background: rgba(0, 0, 0, 0.1);
+      border: 1px solid rgba(0, 0, 0, 0.2);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 1px 1px rgba(0, 0, 0, 0.2);
+      transition: 170ms ease all; }
   .raven .option-subtitle {
     font-size: smaller; }
 
@@ -5047,7 +5066,6 @@ treeview.view header button:active {
     padding: 8px; }
 
 .budgie-notification-window {
-  background: none;
   border-radius: 1px; }
 
 .budgie-notification.background {
@@ -5057,27 +5075,30 @@ treeview.view header button:active {
   font-size: 110%;
   color: #444; }
 .budgie-notification .notification-body {
-  color: rgba(255, 255, 255, 0.7); }
+  color: rgba(207, 216, 220, 0.7); }
 
 .drop-shadow, .budgie-session-dialog.background, .background.budgie-polkit-dialog {
-  background-color: transparent;
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.2); }
-  box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 0 0 1px rgba(0, 0, 0, 0.2);
-  border-radius: 1px; }
 
-.budgie-session-dialog .linked.horizontal > .button, .budgie-polkit-dialog .linked.horizontal > .button {
+.budgie-session-dialog, .budgie-polkit-dialog {
-  border-bottom: none;
+  padding: 12px;
-  border-radius: 0; }
+  border-radius: 4px;
-  .budgie-session-dialog .linked.horizontal > .button:first-child, .budgie-polkit-dialog .linked.horizontal > .button:first-child {
+  border: none;
-    border-left: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.1); }
-    border-radius: 0; }
+  .budgie-session-dialog .linked.horizontal > .button, .budgie-polkit-dialog .linked.horizontal > .button {
-  .budgie-session-dialog .linked.horizontal > .button:last-child, .budgie-polkit-dialog .linked.horizontal > .button:last-child {
+    border-bottom: none;
-    border-right: none;
     border-radius: 0; }
+    .budgie-session-dialog .linked.horizontal > .button:first-child, .budgie-polkit-dialog .linked.horizontal > .button:first-child {
+      border-left: none;
+      border-radius: 0 0 0 4px; }
+    .budgie-session-dialog .linked.horizontal > .button:last-child, .budgie-polkit-dialog .linked.horizontal > .button:last-child {
+      border-right: none;
+      border-radius: 0 0 4px 0; }
 
 .budgie-polkit-dialog .message {
-  color: rgba(255, 255, 255, 0.7); }
+  color: rgba(207, 216, 220, 0.7); }
 .budgie-polkit-dialog .failure {
-  color: #f34235; }
+  color: #F44336; }
 
 /***************
  * font-viewer *
@@ -5999,14 +6020,14 @@ ConversationListView {
   border-width: 0 1px 1px 1px; }
 
 #buttonbox_frame button {
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-color: rgba(0, 0, 0, 0.7);
   background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
   icon-shadow: 0 1px black;
-  outline-color: rgba(228, 230, 231, 0.3); }
+  outline-color: rgba(207, 216, 220, 0.3); }
   #buttonbox_frame button:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -6015,7 +6036,7 @@ ConversationListView {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   #buttonbox_frame button:active, #buttonbox_frame button:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -6024,11 +6045,11 @@ ConversationListView {
     box-shadow: none;
     text-shadow: none;
     icon-shadow: none;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   #buttonbox_frame button:insensitive {
-    color: #828687;
+    color: #787f81;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;

Paper/gtk-3.18/widgets/_switches.scss

@@ -14,11 +14,11 @@ GtkSwitch {
   border-radius: 14px;
   color: transparent;
 
-  background-color: transparentize(black, 0.9);
+  background-color: if($variant == 'light', transparentize(black, 0.9), transparent);
-  box-shadow: inset 0 0 0 1px transparentize(black, 0.95), 0px 1px $bottom_highlight;
+  box-shadow: if($variant == 'light', (inset 0 0 0 1px transparentize(black, 0.8), 0px 1px $bottom_highlight), 0 0 0 1px transparentize(black, 0.7));
 
   &:insensitive {
-    background-color: $insensitive_bg_color;
+    background-color: transparentize(black, 0.9);
   }
 
   &:backdrop {
@@ -40,7 +40,7 @@ GtkSwitch {
       slider {
         &:backdrop {
           box-shadow:none;
-          background-color:transparentize($base_color, 0.1);
+          background-color:transparentize($bg_color, 0.1);
           border:none;
         }
       }
@@ -52,15 +52,21 @@ GtkSwitch {
     padding:2px;
     border-radius: 50%;
     transition: $button_transition;
-    background-color: $base_color;
+    background-color: if($variant == 'light', $bg_color, darken($bg_color, 5%));
 
-    box-shadow: 0 2px 2px transparentize(black, 0.8),
+    box-shadow: if($variant == 'light', (
-                0 1px 2px transparentize(black, 0.8);
+                  0 2px 2px transparentize(black, 0.8),
+                  0 1px 2px transparentize(black, 0.8)
+                  ),(
+                  none
+                ));
 
     &:backdrop {
-      padding:2px;
       box-shadow:none;
-      background-color:$base_color;
+    }
+
+    &:insensitive {
+      box-shadow:none;
     }
   }
 
@@ -75,5 +81,6 @@ GtkSwitch {
         background-color: $backdrop_selected_bg_color;
       }
     }
+
   }
 }

Paper/gtk-3.20/_colors.scss

@@ -2,20 +2,21 @@
 // it gets @if ed depending on $variant
 
 // Main definitions
-$base_color: if($variant == 'light', #ffffff, #6a7981);
+$base_color: if($variant == 'light', #ffffff, #455a64);
-$bg_color: if($variant == 'light', #f7f7f7, #4F585C);
+$bg_color: if($variant == 'light', #f7f7f7, #37474f);
-$fg_color: if($variant == 'light', #444, lighten(#e4e6e7, 10%));
+$fg_color: if($variant == 'light', #444, #cfd8dc);
 $text_color: if($variant == 'light', $fg_color, $fg_color);
-$headerbar_bg_color: if($variant == 'light', #546e7a, #3B4245);
+$headerbar_bg_color: if($variant == 'light', #546e7a, #303e45);
 $headerbar_fg_color: if($variant == 'light', #ffffff, transparentize(#ffffff, 0.2));
 
 // Primary colors
-$red: #f34235;
+$red: #F44336;
-$orange: #fe9700;
+$orange: #ff5722;
-$yellow: #fec006;
+$yellow: #f9ce1d;
-$green: #4bae4f;
+$green: #4caf50;
-$blue: #2095f2;
+$blue: #2196f3;
-$purple: #9b26af;
+$purple: #9c27b0;
+
 
 $selected_fg_color: #ffffff;
 $selected_bg_color: if($variant == 'light', #347D9F, lighten(#347D9F,10%));
@@ -42,7 +43,7 @@ $success_color: if($variant == 'light', $green, darken($green,10%));
 $destructive_color: if($variant == 'light', $red, darken($red,10%));
 $suggested_color: if($variant == 'light', $selected_bg_color, darken($selected_bg_color,10%));
 
-$osd_fg_color: #e4e6e7;
+$osd_fg_color: #cfd8dc;
 $osd_text_color: white;
 $osd_bg_color: transparentize(#202526, 0.2);
 $osd_insensitive_bg_color: transparentize(mix($osd_fg_color, opacify($osd_bg_color, 1), 10%), 0.5);

Paper/gtk-3.20/apps/_budgie.scss

@@ -1,102 +1,254 @@
-/**********
+/*********
 * Budgie *
 **********/
 
+$budgie_panel_bg_color: #263238;
+$budgie_panel_fg_color: #cfd8dc;
+
+@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');
+
+%underscores {
+  &:hover { background-color: transparentize(black, 0.9); }
+  &:active, &:checked { background-color: transparentize(black, 0.8); }
+
+  @each $pos, $b_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); }
+      }
+
+      &:hover {
+        border-#{$b_pos}: 2px solid transparentize(black, 0.9);
+        border-#{$pos}: 2px solid transparentize($selected_bg_color, 0.5);
+      }
+
+      &:active, &:checked {
+        border-#{$b_pos}: 2px solid transparentize(black, 0.8);
+        border-#{$pos}: 2px solid $selected_bg_color;
+      }
+    }
+  }
+}
+
+// Budgie
+.budgie-container {
+  border: none;
+  box-shadow: none;
+  background: none;
+  font-size: 100%;
+}
+
+// Budgie Menu
+.budgie-menu {
+  GtkSearchEntry.entry:not(:selected) {
+    border: none;
+    box-shadow: none;
+    background: none;
+    font-size: 100%;
+
+    &.image { padding-left: 0px; padding-right: 6px; }
+  }
+  .list-row.activatable:selected,
+  .list-row.activatable:selected .button { color: inherit; }
+}
+
+// Panel
 .budgie-panel {
-  background-color: transparentize(black, 0.2);
+  font: bold;
-  transition: 100ms ease-in;
+  font-size: 100%;
-  font:bold;
+  color: $budgie_panel_fg_color;
-  color: white;
+  background-color: $budgie_panel_bg_color;
 
-  .top {
+  &:backdrop {
-    border-bottom: 1px solid transparentize(white, 0.8);
+    color: $budgie_panel_fg_color;
+    background-color: $budgie_panel_bg_color;
   }
 
-  .bottom {
+  // Tasklist
-    border-top: 1px solid transparentize(white, 0.8);
+  WnckTasklist {
+    .button,
+    .button:backdrop {
+
+      border-radius: 0;
+
+      @if $variant == 'default' {
+        // &:not(:hover):not(:active):not(:checked) { color: gtkalpha(currentColor, 0.5); }
+        background: none;
+        background-clip: padding-box;
+        border: none;
+
+        @extend %underscores;
+      }
+    }
   }
 
-  .left {
+  // Icon Tasklist
-    border-right: 1px solid transparentize(white, 0.8);
+  .launcher {
+    // transition: all 100ms cubic-bezier(0.25, 0.46, 0.45, 0.94);
+    padding-left: 2px;
+    padding-right: 2px;
+    border-color: transparentize($budgie_panel_bg_color, 1.0); // fixes the transition
+
+    &:hover { -gtk-image-effect: highlight; }
   }
 
-  .right {
+  .unpinned {
-    border-left: 1px solid transparentize(white, 0.8);
+    .launcher {
+      @extend %underscores;
+    }
+  }
+
+  .pinned {
+    .launcher.running {
+      @extend %underscores;
+    }
+   }
+}
+
+
+
+@each $pos, $b_pos in $pos_list {
+
+  // Panel borders
+  .#{$pos} .budgie-panel {
+    border-#{$b_pos}: 1px solid transparentize(black,0.8);
+    box-shadow:none;
+  }
+
+  // Raven borders
+  .#{$pos} .raven-frame {
+    border-#{$b_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,
+                      $shadow_color,
+                      transparent);
   }
 }
 
-.max-budgie-panel  {
+// Raven
-  background-color: transparentize(black, 0.0);
-  transition: 100ms ease-in;
-  font:bold;
-  color: white;
 
-  .top {
+.raven {
-    border-bottom: 1px solid transparentize(white, 0.8);
+  color: $fg_color;
+  background-color: transparentize($bg_color, 0.02);
+  transition: 170ms ease-out;
+
+  .raven-header {
+    background-color: $bg_color;
+    color: $fg_color;
+    border-top: 1px solid $borders_color;
+    border-bottom: 1px solid $borders_color;
+    box-shadow:inset 0 1px 0 0 transparentize(white,0.9), 0 1px 1px 0 transparentize(black,0.9);
+
+    &.top { border-top-style: none; }
+    &.bottom { border-bottom-style: none; }
   }
 
-  .bottom {
+  @if $variant=='default' {
-    border-top: 1px solid transparentize(white, 0.8);
+    .expander-button { color: gtkalpha(currentColor, 0.5); }
   }
 
-  .left {
+  .raven-background {
-    border-right: 1px solid transparentize(white, 0.8);
+    background-color: $base_color;
+    border-bottom: 1px solid $borders_color;
+    box-shadow:inset 0 1px 0 0 transparentize(white,0.9), 0 1px 1px 0 transparentize(black,0.9);
+
+    &.middle { border-bottom-style: none; }  // applet background between two headers
   }
 
-  .right {
+  .powerstrip {
-    border-left: 1px solid transparentize(white, 0.8);
+    background-color: transparent;
+    border: none;
+    box-shadow:none;
+  }
+
+  .powerstrip .button {
+    border-radius:50%;
+    padding: 12px;
+    background: transparentize(black,0.9);
+    border: 1px solid transparentize(black,0.8);
+    box-shadow: 0 1px transparentize(white,0.9);
+    font-size: 100%;
+
+    &:hover {
+      background: transparentize(black,0.9);
+      border: 1px solid transparentize(black,0.8);
+      box-shadow: inset 0 1px transparentize(white,0.9), 1px 1px transparentize(black,0.8);
+      transition: 170ms ease all;
+    }
+  }
+
+  .option-subtitle {
+    font-size: smaller;
   }
 }
 
+// MPRIS Applet
+.raven-mpris {
+  // color: $mpris_overlay_fg;
+  // background-color: $mpris_overlay_bg;
+  // border: solid $mpris_overlay_border;
+  border-width: 1px 0;
 
-.budgie-panel .message-area {
+  .button.image-button { padding: 8px; }
 }
 
-.budgie-panel .max-message-area {
+// Notifications
+.budgie-notification-window {
+  border-radius: 1px;
 }
 
-.budgie-panel .launcher,
+.budgie-notification {
-PanelToplevel .launcher {
+  &.background {
-}
+    background-color: white;
-.budgie-panel .launcher:hover,
+    border-radius: 4px;
-PanelToplevel .launcher:hover {
+  }
-}
+
-.budgie-panel .launcher:active,
+  .notification-title {
-PanelToplevel .launcher:active {
+    font-size: 110%;
+    color: $fg_color;
+  }
+
+  .notification-body { color: transparentize($budgie_panel_fg_color, 0.3); }
 }
 
-/* Top launchers */
+.drop-shadow {
-.top .launcher:hover {
+  box-shadow: 0 1px 1px 0 $shadow_color;
-}
-.top .launcher:active {
 }
 
-/* Left hand side launchers */
+// Session Dialog
-.left .launcher:hover {
+.budgie-session-dialog {
-}
+  padding:12px;
-.left .launcher:active {
+  border-radius: 4px;
+  border:none;
+  border-top: 1px solid transparentize(white,0.9);
+  &.background { @extend .drop-shadow; }
+
+  .linked.horizontal > .button {
+    border-bottom: none;
+    border-radius: 0;
+    &:first-child { border-left: none; border-radius: 0 0 0 4px; }
+    &:last-child { border-right: none; border-radius: 0 0 4px 0; }
+  }
 }
 
-/* Right hand side launchers */
+// PolKit Dialog
-.right .launcher:hover {
+.budgie-polkit-dialog {
-}
+  @extend .budgie-session-dialog;
-.right .launcher:active {
-}
 
-.panel-applet {
+  .message { color: transparentize($budgie_panel_fg_color, 0.3); }
-}
+  .failure { color: $red; }
-
-.budgie-panel .menu-icon,
-.budgie-panel .menu-icon:active,
-.budgie-panel .menu-icon:hover {
-}
-
-.notification .priority.low {
-  background-color: $info_color;
-}
-.notification .priority.high {
-  background-color: $warning_color;
-}
-.notification .priority.critical {
-  background-color: $error_color;
 }

Paper/gtk-3.20/gtk.css

@@ -53,9 +53,9 @@
 /* widgets main borders color on backdrop windows */
 @define-color unfocused_borders #d5d5d5;
 /* these are pretty self explicative */
-@define-color warning_color #fec006;
+@define-color warning_color #f9ce1d;
-@define-color error_color #f34235;
+@define-color error_color #F44336;
-@define-color success_color #4bae4f;
+@define-color success_color #4caf50;
 /* these colors are exported for the window manager and shouldn't be used in applications,
 read if you used those and something break with a version upgrade you're on your own... */
 @define-color wm_title shade(#444, 1.8);
@@ -78,7 +78,7 @@ read if you used those and something break with a version upgrade you're on your
 * {
   padding: 0;
   -GtkToolButton-icon-spacing: 4;
-  -GtkTextView-error-underline-color: #f34235;
+  -GtkTextView-error-underline-color: #F44336;
   -GtkScrolledWindow-scrollbar-spacing: 0;
   -GtkToolItemGroup-expander-size: 11;
   -GtkTreeView-expander-size: 11;
@@ -269,11 +269,11 @@ headerbar .subtitle {
 .app-notification,
 .app-notification.frame, .osd .scale-popup, .csd popover.background.touch-selection, .csd popover.background.magnifier, popover.background.touch-selection, popover.background.magnifier, .csd popover.background.osd, popover.background.osd,
 .osd {
-  color: #e4e6e7;
+  color: #cfd8dc;
   border: none;
   background-color: rgba(32, 37, 38, 0.8);
   background-clip: padding-box;
-  outline-color: rgba(228, 230, 231, 0.3);
+  outline-color: rgba(207, 216, 220, 0.3);
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black; }
   .app-notification:backdrop, .osd .scale-popup:backdrop, popover.background.touch-selection:backdrop, popover.background.magnifier:backdrop, popover.background.osd:backdrop,
@@ -610,17 +610,17 @@ button {
 button.osd {
   min-width: 24px;
   min-height: 32px;
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-radius: 5px;
-  outline-color: rgba(228, 230, 231, 0.3);
+  outline-color: rgba(207, 216, 220, 0.3);
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-color: rgba(0, 0, 0, 0.7);
   background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black;
-  outline-color: rgba(228, 230, 231, 0.3);
+  outline-color: rgba(207, 216, 220, 0.3);
   border: none;
   box-shadow: none; }
   button.osd.image-button {
@@ -633,7 +633,7 @@ button.osd {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3);
+    outline-color: rgba(207, 216, 220, 0.3);
     border: none;
     box-shadow: none; }
   button.osd:active,
@@ -645,21 +645,21 @@ button.osd {
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
-    outline-color: rgba(228, 230, 231, 0.3);
+    outline-color: rgba(207, 216, 220, 0.3);
     border: none;
     box-shadow: none; }
   button.osd:disabled:backdrop,
   button.osd:disabled {
-    color: #828687;
+    color: #787f81;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
     border: none; }
   button.osd:backdrop {
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
     background-clip: padding-box;
@@ -671,14 +671,14 @@ button.osd {
 .app-notification.frame .button,
 .app-notification.frame button, .csd popover.background.touch-selection button, .csd popover.background.magnifier button, popover.background.touch-selection button, popover.background.magnifier button, .osd
 button {
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-color: rgba(0, 0, 0, 0.7);
   background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black;
-  outline-color: rgba(228, 230, 231, 0.3); }
+  outline-color: rgba(207, 216, 220, 0.3); }
   .app-notification .button:hover, .app-notification button:hover, popover.background.touch-selection button:hover, popover.background.magnifier button:hover, .osd
   button:hover {
     color: white;
@@ -688,7 +688,7 @@ button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   .app-notification .button:active:backdrop, .app-notification button:active:backdrop, popover.background.touch-selection button:active:backdrop, popover.background.magnifier button:active:backdrop, .app-notification .button:active, .app-notification button:active, popover.background.touch-selection button:active, popover.background.magnifier button:active, .app-notification .button:checked:backdrop, .app-notification button:checked:backdrop, popover.background.touch-selection button:checked:backdrop, popover.background.magnifier button:checked:backdrop, .app-notification .button:checked, .app-notification button:checked, popover.background.touch-selection button:checked, popover.background.magnifier button:checked, .osd
   button:active:backdrop, .osd
   button:active, .osd
@@ -701,20 +701,20 @@ button {
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   .app-notification .button:disabled:backdrop, .app-notification button:disabled:backdrop, popover.background.touch-selection button:disabled:backdrop, popover.background.magnifier button:disabled:backdrop, .app-notification .button:disabled, .app-notification button:disabled, popover.background.touch-selection button:disabled, popover.background.magnifier button:disabled, .osd
   button:disabled:backdrop, .osd
   button:disabled {
-    color: #828687;
+    color: #787f81;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .app-notification .button:backdrop, .app-notification button:backdrop, popover.background.touch-selection button:backdrop, popover.background.magnifier button:backdrop, .osd
   button:backdrop {
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
     background-clip: padding-box;
@@ -741,12 +741,12 @@ button {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
     .app-notification .flat.button:disabled, .app-notification button.flat:disabled, popover.background.touch-selection button.flat:disabled, popover.background.magnifier button.flat:disabled, .osd
     button.flat:disabled {
-      color: #828687;
+      color: #787f81;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -772,7 +772,7 @@ button {
       box-shadow: none;
       text-shadow: none;
       -gtk-icon-shadow: none;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
 button.suggested-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.3);
@@ -923,14 +923,14 @@ button.suggested-action {
         color: #b7cdd7; }
   .osd
   button.suggested-action {
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(52, 125, 159, 0.5));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     button.suggested-action:hover {
       color: white;
@@ -940,7 +940,7 @@ button.suggested-action {
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     button.suggested-action:active:backdrop, .osd
     button.suggested-action:active, .osd
@@ -953,20 +953,20 @@ button.suggested-action {
       box-shadow: none;
       text-shadow: none;
       -gtk-icon-shadow: none;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     button.suggested-action:disabled:backdrop, .osd
     button.suggested-action:disabled {
-      color: #828687;
+      color: #787f81;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     .osd
     button.suggested-action:backdrop {
-      color: #e4e6e7;
+      color: #cfd8dc;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(52, 125, 159, 0.5));
       background-clip: padding-box;
@@ -976,10 +976,10 @@ button.suggested-action {
 button.destructive-action {
   color: white;
   outline-color: rgba(255, 255, 255, 0.3);
-  border-color: #9f1409;
+  border-color: #a21309;
-  background-image: linear-gradient(to bottom, #f34235, #f22b1d);
+  background-image: linear-gradient(to bottom, #F44336, #f32c1e);
-  text-shadow: 0 1px rgba(0, 0, 0, 0.53569);
+  text-shadow: 0 1px rgba(0, 0, 0, 0.53255);
-  -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.53569);
+  -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.53255);
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.4);
   box-shadow: 0 1px 0 0 rgba(255, 255, 255, 0.8); }
   button.destructive-action.flat {
@@ -989,29 +989,29 @@ button.destructive-action {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #f34235; }
+    color: #F44336; }
   button.destructive-action:hover {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #9f1409;
+    border-color: #a21309;
-    background-image: linear-gradient(to bottom, #f55d52, #f34235 60%, #f23022);
+    background-image: linear-gradient(to bottom, #f65e53, #F44336 60%, #f33123);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.48769);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.48455);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.48769);
+    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.48455);
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.4); }
   button.destructive-action:active,
   button.destructive-action:checked {
     color: white;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #9f1409;
+    border-color: #a21309;
-    background-image: linear-gradient(to bottom, #f12213, #f2392b);
+    background-image: linear-gradient(to bottom, #f22314, #f33a2c);
-    text-shadow: 0 1px rgba(0, 0, 0, 0.61569);
+    text-shadow: 0 1px rgba(0, 0, 0, 0.61255);
-    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.61569);
+    -gtk-icon-shadow: 0 -1px rgba(0, 0, 0, 0.61255);
     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.destructive-action:backdrop,
   button.destructive-action.flat:backdrop {
-    border-color: #f34235;
+    border-color: #F44336;
-    background-image: linear-gradient(to bottom, #f34235);
+    background-image: linear-gradient(to bottom, #F44336);
     text-shadow: none;
     -gtk-icon-shadow: none;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0); }
@@ -1029,7 +1029,7 @@ button.destructive-action {
     button.destructive-action:backdrop:checked,
     button.destructive-action.flat:backdrop:active,
     button.destructive-action.flat:backdrop:checked {
-      border-color: #e71d0e;
+      border-color: #ea1c0d;
       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.destructive-action:backdrop:active GtkLabel,
@@ -1040,7 +1040,7 @@ button.destructive-action {
       button.destructive-action.flat:backdrop:active,
       button.destructive-action.flat:backdrop:checked GtkLabel,
       button.destructive-action.flat:backdrop:checked {
-        color: #fad2cf; }
+        color: #fbd2cf; }
       button.destructive-action:backdrop:active label,
       button.destructive-action:backdrop:active,
       button.destructive-action:backdrop:checked label,
@@ -1049,7 +1049,7 @@ button.destructive-action {
       button.destructive-action.flat:backdrop:active,
       button.destructive-action.flat:backdrop:checked label,
       button.destructive-action.flat:backdrop:checked {
-        color: #fad2cf; }
+        color: #fbd2cf; }
     button.destructive-action:backdrop:disabled,
     button.destructive-action.flat:backdrop:disabled {
       border-color: #d5d5d5;
@@ -1072,15 +1072,15 @@ button.destructive-action {
       button.destructive-action:backdrop:disabled:checked,
       button.destructive-action.flat:backdrop:disabled:active,
       button.destructive-action.flat:backdrop:disabled:checked {
-        border-color: #f4473b;
+        border-color: #f5483c;
         background-image: none;
-        background-color: #f4473b;
+        background-color: #f5483c;
         box-shadow: inset 0 1px 1px 0 rgba(0, 0, 0, 0.05), 0 1px 0 0 rgba(255, 255, 255, 0.8); }
         button.destructive-action:backdrop:disabled:active label,
         button.destructive-action:backdrop:disabled:checked label,
         button.destructive-action.flat:backdrop:disabled:active label,
         button.destructive-action.flat:backdrop:disabled:checked label {
-          color: #f88780; }
+          color: #f98880; }
   button.destructive-action.flat:backdrop,
   button.destructive-action.flat:disabled,
   button.destructive-action.flat:backdrop:disabled {
@@ -1090,7 +1090,7 @@ button.destructive-action {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: rgba(243, 66, 53, 0.8); }
+    color: rgba(244, 67, 54, 0.8); }
   button.destructive-action:disabled {
     border-color: #d1d1d1;
     background-image: none;
@@ -1106,41 +1106,41 @@ button.destructive-action {
       color: #9e9e9e; }
     button.destructive-action:disabled:active,
     button.destructive-action:disabled:checked {
-      border-color: #9f1409;
+      border-color: #a21309;
       background-image: none;
-      background-color: #f4473b;
+      background-color: #f5483c;
       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.destructive-action:disabled:active GtkLabel,
       button.destructive-action:disabled:active,
       button.destructive-action:disabled:checked GtkLabel,
       button.destructive-action:disabled:checked {
-        color: #fbb5b1; }
+        color: #fbb6b1; }
       button.destructive-action:disabled:active label,
       button.destructive-action:disabled:active,
       button.destructive-action:disabled:checked label,
       button.destructive-action:disabled:checked {
-        color: #fbb5b1; }
+        color: #fbb6b1; }
   .osd
   button.destructive-action {
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(243, 66, 53, 0.5));
+    background-image: linear-gradient(to bottom, rgba(244, 67, 54, 0.5));
     background-clip: padding-box;
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     button.destructive-action:hover {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(243, 66, 53, 0.7));
+      background-image: linear-gradient(to bottom, rgba(244, 67, 54, 0.7));
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     button.destructive-action:active:backdrop, .osd
     button.destructive-action:active, .osd
@@ -1148,27 +1148,27 @@ button.destructive-action {
     button.destructive-action:checked {
       color: white;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, #f34235);
+      background-image: linear-gradient(to bottom, #F44336);
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       -gtk-icon-shadow: none;
-      outline-color: rgba(228, 230, 231, 0.3); }
+      outline-color: rgba(207, 216, 220, 0.3); }
     .osd
     button.destructive-action:disabled:backdrop, .osd
     button.destructive-action:disabled {
-      color: #828687;
+      color: #787f81;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
       -gtk-icon-shadow: none; }
     .osd
     button.destructive-action:backdrop {
-      color: #e4e6e7;
+      color: #cfd8dc;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(243, 66, 53, 0.5));
+      background-image: linear-gradient(to bottom, rgba(244, 67, 54, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -2273,28 +2273,28 @@ entry {
     box-shadow: none; }
   spinbutton.error:not(.vertical), GeditWindow > .error.entry,
   entry.error {
-    color: #f34235;
+    color: #F44336;
-    border-color: #f34235; }
+    border-color: #F44336; }
     spinbutton.error:focus:not(.vertical), GeditWindow > .error.entry:focus,
     entry.error: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: #f34235; }
+      border-color: #F44336; }
     spinbutton.error:selected:focus:not(.vertical), GeditWindow > .error.entry:selected:focus, spinbutton.error:selected:not(.vertical), GeditWindow > .error.entry:selected,
     entry.error:selected:focus,
     entry.error:selected {
-      background-color: #f34235; }
+      background-color: #F44336; }
   spinbutton.warning:not(.vertical), GeditWindow > .warning.entry,
   entry.warning {
-    color: #fec006;
+    color: #f9ce1d;
-    border-color: #fec006; }
+    border-color: #f9ce1d; }
     spinbutton.warning:focus:not(.vertical), GeditWindow > .warning.entry:focus,
     entry.warning: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: #fec006; }
+      border-color: #f9ce1d; }
     spinbutton.warning:selected:focus:not(.vertical), GeditWindow > .warning.entry:selected:focus, spinbutton.warning:selected:not(.vertical), GeditWindow > .warning.entry:selected,
     entry.warning:selected:focus,
     entry.warning:selected {
-      background-color: #fec006; }
+      background-color: #f9ce1d; }
   spinbutton:not(.vertical) image, GeditWindow > .entry image,
   entry image {
     color: dimgray; }
@@ -2341,9 +2341,9 @@ entry {
       -gtk-icon-shadow: none; }
     .osd spinbutton:disabled:not(.vertical), .osd GeditWindow > .entry:disabled, .osd
     entry:disabled {
-      color: #828687;
+      color: #787f81;
       border-color: rgba(0, 0, 0, 0.7);
-      background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+      background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
       background-clip: padding-box;
       box-shadow: none;
       text-shadow: none;
@@ -2824,7 +2824,7 @@ GraniteWidgetsWelcome {
   background-color: transparent;
   padding: 8px 6px; }
 .storage-bar .fill-block {
-  background-color: #fec006;
+  background-color: #f9ce1d;
   border: none;
   box-shadow: inset 0 1px 0 0 rgba(0, 0, 0, 0.1), inset 0 -1px 0 0 rgba(0, 0, 0, 0.1);
   transition: all 200ms ease-in-out;
@@ -2841,13 +2841,13 @@ GraniteWidgetsWelcome {
   .storage-bar .fill-block.empty-block {
     background-color: #ffffff; }
   .storage-bar .fill-block.app {
-    background-color: #2095f2; }
+    background-color: #2196f3; }
   .storage-bar .fill-block.audio {
-    background-color: #fe9700; }
+    background-color: #ff5722; }
   .storage-bar .fill-block.photo {
-    background-color: #f34235; }
+    background-color: #F44336; }
   .storage-bar .fill-block.video {
-    background-color: #9b26af; }
+    background-color: #9c27b0; }
   .storage-bar .fill-block .legend {
     padding: 12px;
     border-radius: 4px; }
@@ -3307,27 +3307,27 @@ infobar {
       box-shadow: none; }
 
 .info {
-  background-color: #2095f2; }
+  background-color: #2196f3; }
   .info:backdrop {
-    background-color: #50acf5;
+    background-color: #51adf6;
     color: rgba(255, 255, 255, 0.5); }
 
 .warning {
-  background-color: #fec006; }
+  background-color: #f9ce1d; }
   .warning:backdrop {
-    background-color: #fecd39;
+    background-color: #fad94f;
     color: rgba(255, 255, 255, 0.5); }
 
 .question {
-  background-color: #4bae4f; }
+  background-color: #4caf50; }
   .question:backdrop {
-    background-color: #6cc070;
+    background-color: #6ec071;
     color: rgba(255, 255, 255, 0.5); }
 
 .error {
-  background-color: #f34235; }
+  background-color: #F44336; }
   .error:backdrop {
-    background-color: #f66f65;
+    background-color: #f77066;
     color: rgba(255, 255, 255, 0.5); }
 
 /*************
@@ -3361,14 +3361,14 @@ levelbar {
     levelbar.vertical block.level-low,
     levelbar block.low,
     levelbar block.level-low {
-      border: 1px solid #d09c01;
+      border: 1px solid #ddb306;
-      background-color: #fec006; }
+      background-color: #f9ce1d; }
       levelbar.vertical .low.fill-block:backdrop,
       levelbar.vertical block.low:backdrop, levelbar.vertical .level-low.fill-block:backdrop,
       levelbar.vertical block.level-low:backdrop,
       levelbar block.low:backdrop,
       levelbar block.level-low:backdrop {
-        border: 1px solid #fec006; }
+        border: 1px solid #f9ce1d; }
     levelbar.vertical .high.fill-block,
     levelbar.vertical block.high, levelbar.vertical .level-high.fill-block,
     levelbar.vertical block.level-high,
@@ -3387,14 +3387,14 @@ levelbar {
     levelbar.vertical block.level-full,
     levelbar block.full,
     levelbar block.level-full {
-      border: 1px solid #3c8a3f;
+      border: 1px solid #3d8b40;
-      background-color: #4bae4f; }
+      background-color: #4caf50; }
       levelbar.vertical .full.fill-block:backdrop,
       levelbar.vertical block.full:backdrop, levelbar.vertical .level-full.fill-block:backdrop,
       levelbar.vertical block.level-full:backdrop,
       levelbar block.full:backdrop,
       levelbar block.level-full:backdrop {
-        border: 1px solid #4bae4f; }
+        border: 1px solid #4caf50; }
     levelbar.vertical .empty.fill-block,
     levelbar.vertical block.empty, levelbar.vertical .level-empty.fill-block,
     levelbar.vertical block.level-empty,
@@ -4239,7 +4239,7 @@ progressbar, scale trough, scale fill {
     border-color: rgba(0, 0, 0, 0.7);
     background-color: rgba(0, 0, 0, 0.5);
     box-shadow: none;
-    outline-color: rgba(228, 230, 231, 0.2); }
+    outline-color: rgba(207, 216, 220, 0.2); }
     .osd levelbar trough:disabled, levelbar .osd trough:disabled,
     .osd levelbar.horizontal .trough:disabled,
     levelbar.horizontal .osd .trough:disabled,
@@ -4247,7 +4247,7 @@ progressbar, scale trough, scale fill {
     levelbar.vertical .osd .trough:disabled, .osd GtkProgressBar:disabled,
     .osd .progressbar:disabled,
     .osd progressbar:disabled, .osd scale trough:disabled, scale .osd trough:disabled, .osd scale fill:disabled, scale .osd fill:disabled {
-      background-color: rgba(52, 56, 57, 0.5); }
+      background-color: rgba(50, 55, 56, 0.5); }
 
 GtkProgressBar .progressbar,
 GtkProgressBar progress,
@@ -4406,7 +4406,7 @@ scale {
     border-color: transparent;
     background-color: transparent; }
   .osd scale fill {
-    background-color: rgba(87, 88, 88, 0.775); }
+    background-color: rgba(79, 83, 84, 0.775); }
     .osd scale fill:disabled, .osd scale fill:disabled:backdrop {
       border-color: transparent;
       background-color: transparent; }
@@ -4453,14 +4453,14 @@ scale {
     row:selected scale slider, row:selected scale slider:disabled {
       border-color: #275f79; }
     .osd scale slider {
-      color: #e4e6e7;
+      color: #cfd8dc;
       border-color: rgba(0, 0, 0, 0.7);
       background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
       background-clip: padding-box;
       box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
       text-shadow: 0 1px black;
       -gtk-icon-shadow: 0 1px black;
-      outline-color: rgba(228, 230, 231, 0.3);
+      outline-color: rgba(207, 216, 220, 0.3);
       border-color: rgba(0, 0, 0, 0.7);
       background-color: #202526; }
       .osd scale slider:hover {
@@ -4471,7 +4471,7 @@ scale {
         box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
         text-shadow: 0 1px black;
         -gtk-icon-shadow: 0 1px black;
-        outline-color: rgba(228, 230, 231, 0.3); }
+        outline-color: rgba(207, 216, 220, 0.3); }
       .osd scale slider:active {
         color: white;
         border-color: rgba(0, 0, 0, 0.7);
@@ -4480,17 +4480,17 @@ scale {
         box-shadow: none;
         text-shadow: none;
         -gtk-icon-shadow: none;
-        outline-color: rgba(228, 230, 231, 0.3); }
+        outline-color: rgba(207, 216, 220, 0.3); }
       .osd scale slider:disabled {
-        color: #828687;
+        color: #787f81;
         border-color: rgba(0, 0, 0, 0.7);
-        background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+        background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
         background-clip: padding-box;
         box-shadow: none;
         text-shadow: none;
         -gtk-icon-shadow: none; }
       .osd scale slider:backdrop {
-        color: #e4e6e7;
+        color: #cfd8dc;
         border-color: rgba(0, 0, 0, 0.7);
         background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
         background-clip: padding-box;
@@ -5273,7 +5273,7 @@ spinbutton:not(.vertical) button {
   box-shadow: inset 0 1px rgba(255, 255, 255, 0);
   text-shadow: none;
   -gtk-icon-shadow: none;
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-style: none none none solid;
   border-color: rgba(0, 0, 0, 0.4);
   border-radius: 0;
@@ -5287,9 +5287,9 @@ spinbutton:not(.vertical) button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.5);
-    background-color: rgba(228, 230, 231, 0.1);
+    background-color: rgba(207, 216, 220, 0.1);
     box-shadow: none; }
   .osd spinbutton:not(.vertical) button:backdrop {
     border-color: transparent;
@@ -5298,7 +5298,7 @@ spinbutton:not(.vertical) button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.5);
     box-shadow: none; }
   .osd spinbutton:not(.vertical) button:disabled {
@@ -5308,7 +5308,7 @@ spinbutton:not(.vertical) button {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0);
     text-shadow: none;
     -gtk-icon-shadow: none;
-    color: #828687;
+    color: #787f81;
     border-color: rgba(0, 0, 0, 0.5);
     box-shadow: none; }
   .osd spinbutton:not(.vertical) button:last-child {
@@ -5355,14 +5355,14 @@ spinbutton.vertical button.down {
   border-radius: 0 0 3px 3px;
   border-style: none solid solid solid; }
 .osd spinbutton.vertical button:first-child {
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-color: rgba(0, 0, 0, 0.7);
   background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black;
-  outline-color: rgba(228, 230, 231, 0.3); }
+  outline-color: rgba(207, 216, 220, 0.3); }
   .osd spinbutton.vertical button:first-child:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -5371,7 +5371,7 @@ spinbutton.vertical button.down {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   .osd spinbutton.vertical button:first-child:active {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -5380,17 +5380,17 @@ spinbutton.vertical button.down {
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   .osd spinbutton.vertical button:first-child:disabled {
-    color: #828687;
+    color: #787f81;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none; }
   .osd spinbutton.vertical button:first-child:backdrop {
-    color: #e4e6e7;
+    color: #cfd8dc;
     border-color: rgba(0, 0, 0, 0.7);
     background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
     background-clip: padding-box;
@@ -6186,48 +6186,224 @@ decoration {
 /**********************
  * DE-Specific Styles *
  **********************/
-/**********
+/*********
 * Budgie *
 **********/
+.budgie-panel .unpinned .launcher:hover, .budgie-panel .pinned .launcher.running:hover {
+  background-color: rgba(0, 0, 0, 0.1); }
+.budgie-panel .unpinned .launcher:active, .budgie-panel .pinned .launcher.running:active, .budgie-panel .unpinned .launcher:checked, .budgie-panel .pinned .launcher.running:checked {
+  background-color: rgba(0, 0, 0, 0.2); }
+.top .budgie-panel .unpinned .launcher, .budgie-panel .unpinned .top .launcher, .top .budgie-panel .pinned .launcher.running, .budgie-panel .pinned .top .launcher.running {
+  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(52, 125, 159, 0.5); }
+  .top .budgie-panel .unpinned .launcher:hover, .budgie-panel .unpinned .top .launcher:hover, .top .budgie-panel .pinned .launcher.running:hover, .budgie-panel .pinned .top .launcher.running:hover {
+    border-bottom: 2px solid rgba(0, 0, 0, 0.1);
+    border-top: 2px solid rgba(52, 125, 159, 0.5); }
+  .top .budgie-panel .unpinned .launcher:active, .budgie-panel .unpinned .top .launcher:active, .top .budgie-panel .pinned .launcher.running:active, .budgie-panel .pinned .top .launcher.running:active, .top .budgie-panel .unpinned .launcher:checked, .budgie-panel .unpinned .top .launcher:checked, .top .budgie-panel .pinned .launcher.running:checked, .budgie-panel .pinned .top .launcher.running:checked {
+    border-bottom: 2px solid rgba(0, 0, 0, 0.2);
+    border-top: 2px solid #347D9F; }
+.bottom .budgie-panel .unpinned .launcher, .budgie-panel .unpinned .bottom .launcher, .bottom .budgie-panel .pinned .launcher.running, .budgie-panel .pinned .bottom .launcher.running {
+  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(52, 125, 159, 0.5); }
+  .bottom .budgie-panel .unpinned .launcher:hover, .budgie-panel .unpinned .bottom .launcher:hover, .bottom .budgie-panel .pinned .launcher.running:hover, .budgie-panel .pinned .bottom .launcher.running:hover {
+    border-top: 2px solid rgba(0, 0, 0, 0.1);
+    border-bottom: 2px solid rgba(52, 125, 159, 0.5); }
+  .bottom .budgie-panel .unpinned .launcher:active, .budgie-panel .unpinned .bottom .launcher:active, .bottom .budgie-panel .pinned .launcher.running:active, .budgie-panel .pinned .bottom .launcher.running:active, .bottom .budgie-panel .unpinned .launcher:checked, .budgie-panel .unpinned .bottom .launcher:checked, .bottom .budgie-panel .pinned .launcher.running:checked, .budgie-panel .pinned .bottom .launcher.running:checked {
+    border-top: 2px solid rgba(0, 0, 0, 0.2);
+    border-bottom: 2px solid #347D9F; }
+.left .budgie-panel .unpinned .launcher, .budgie-panel .unpinned .left .launcher, .left .budgie-panel .pinned .launcher.running, .budgie-panel .pinned .left .launcher.running {
+  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(52, 125, 159, 0.5); }
+  .left .budgie-panel .unpinned .launcher:hover, .budgie-panel .unpinned .left .launcher:hover, .left .budgie-panel .pinned .launcher.running:hover, .budgie-panel .pinned .left .launcher.running:hover {
+    border-right: 2px solid rgba(0, 0, 0, 0.1);
+    border-left: 2px solid rgba(52, 125, 159, 0.5); }
+  .left .budgie-panel .unpinned .launcher:active, .budgie-panel .unpinned .left .launcher:active, .left .budgie-panel .pinned .launcher.running:active, .budgie-panel .pinned .left .launcher.running:active, .left .budgie-panel .unpinned .launcher:checked, .budgie-panel .unpinned .left .launcher:checked, .left .budgie-panel .pinned .launcher.running:checked, .budgie-panel .pinned .left .launcher.running:checked {
+    border-right: 2px solid rgba(0, 0, 0, 0.2);
+    border-left: 2px solid #347D9F; }
+.right .budgie-panel .unpinned .launcher, .budgie-panel .unpinned .right .launcher, .right .budgie-panel .pinned .launcher.running, .budgie-panel .pinned .right .launcher.running {
+  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(52, 125, 159, 0.5); }
+  .right .budgie-panel .unpinned .launcher:hover, .budgie-panel .unpinned .right .launcher:hover, .right .budgie-panel .pinned .launcher.running:hover, .budgie-panel .pinned .right .launcher.running:hover {
+    border-left: 2px solid rgba(0, 0, 0, 0.1);
+    border-right: 2px solid rgba(52, 125, 159, 0.5); }
+  .right .budgie-panel .unpinned .launcher:active, .budgie-panel .unpinned .right .launcher:active, .right .budgie-panel .pinned .launcher.running:active, .budgie-panel .pinned .right .launcher.running:active, .right .budgie-panel .unpinned .launcher:checked, .budgie-panel .unpinned .right .launcher:checked, .right .budgie-panel .pinned .launcher.running:checked, .budgie-panel .pinned .right .launcher.running:checked {
+    border-left: 2px solid rgba(0, 0, 0, 0.2);
+    border-right: 2px solid #347D9F; }
+
+.budgie-container {
+  border: none;
+  box-shadow: none;
+  background: none;
+  font-size: 100%; }
+
+.budgie-menu GtkSearchEntry.entry:not(:selected) {
+  border: none;
+  box-shadow: none;
+  background: none;
+  font-size: 100%; }
+  .budgie-menu GtkSearchEntry.entry:not(:selected).image {
+    padding-left: 0px;
+    padding-right: 6px; }
+.budgie-menu .list-row.activatable:selected,
+.budgie-menu .list-row.activatable:selected .button {
+  color: inherit; }
+
 .budgie-panel {
-  background-color: rgba(0, 0, 0, 0.8);
-  transition: 100ms ease-in;
   font: bold;
-  color: white; }
+  font-size: 100%;
-  .budgie-panel .top {
+  color: #cfd8dc;
-    border-bottom: 1px solid rgba(255, 255, 255, 0.2); }
+  background-color: #263238; }
-  .budgie-panel .bottom {
+  .budgie-panel:backdrop {
-    border-top: 1px solid rgba(255, 255, 255, 0.2); }
+    color: #cfd8dc;
-  .budgie-panel .left {
+    background-color: #263238; }
-    border-right: 1px solid rgba(255, 255, 255, 0.2); }
+  .budgie-panel WnckTasklist .button,
-  .budgie-panel .right {
+  .budgie-panel WnckTasklist .button:backdrop {
-    border-left: 1px solid rgba(255, 255, 255, 0.2); }
+    border-radius: 0; }
+  .budgie-panel .launcher {
+    padding-left: 2px;
+    padding-right: 2px;
+    border-color: rgba(38, 50, 56, 0); }
+    .budgie-panel .launcher:hover {
+      -gtk-image-effect: highlight; }
 
-.max-budgie-panel {
+.top .budgie-panel {
-  background-color: black;
+  border-bottom: 1px solid rgba(0, 0, 0, 0.2);
-  transition: 100ms ease-in;
+  box-shadow: none; }
-  font: bold;
-  color: white; }
-  .max-budgie-panel .top {
-    border-bottom: 1px solid rgba(255, 255, 255, 0.2); }
-  .max-budgie-panel .bottom {
-    border-top: 1px solid rgba(255, 255, 255, 0.2); }
-  .max-budgie-panel .left {
-    border-right: 1px solid rgba(255, 255, 255, 0.2); }
-  .max-budgie-panel .right {
-    border-left: 1px solid rgba(255, 255, 255, 0.2); }
 
-/* Top launchers */
+.top .raven-frame {
-/* Left hand side launchers */
+  border-bottom: 1px solid rgba(0, 0, 0, 0.8);
-/* Right hand side launchers */
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3); }
-.notification .priority.low {
-  background-color: #2095f2; }
 
-.notification .priority.high {
+.top .shadow-block {
-  background-color: #fec006; }
+  background-color: transparent;
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2), transparent); }
 
-.notification .priority.critical {
+.bottom .budgie-panel {
-  background-color: #f34235; }
+  border-top: 1px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none; }
+
+.bottom .raven-frame {
+  border-top: 1px solid rgba(0, 0, 0, 0.8);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3); }
+
+.bottom .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to top, rgba(0, 0, 0, 0.2), transparent); }
+
+.left .budgie-panel {
+  border-right: 1px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none; }
+
+.left .raven-frame {
+  border-right: 1px solid rgba(0, 0, 0, 0.8);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3); }
+
+.left .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.2), transparent); }
+
+.right .budgie-panel {
+  border-left: 1px solid rgba(0, 0, 0, 0.2);
+  box-shadow: none; }
+
+.right .raven-frame {
+  border-left: 1px solid rgba(0, 0, 0, 0.8);
+  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.3); }
+
+.right .shadow-block {
+  background-color: transparent;
+  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.2), transparent); }
+
+.raven {
+  color: #444;
+  background-color: rgba(247, 247, 247, 0.98);
+  transition: 170ms ease-out; }
+  .raven .raven-header {
+    background-color: #f7f7f7;
+    color: #444;
+    border-top: 1px solid #d1d1d1;
+    border-bottom: 1px solid #d1d1d1;
+    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.1); }
+    .raven .raven-header.top {
+      border-top-style: none; }
+    .raven .raven-header.bottom {
+      border-bottom-style: none; }
+  .raven .raven-background {
+    background-color: #ffffff;
+    border-bottom: 1px solid #d1d1d1;
+    box-shadow: inset 0 1px 0 0 rgba(255, 255, 255, 0.1), 0 1px 1px 0 rgba(0, 0, 0, 0.1); }
+    .raven .raven-background.middle {
+      border-bottom-style: none; }
+  .raven .powerstrip {
+    background-color: transparent;
+    border: none;
+    box-shadow: none; }
+  .raven .powerstrip .button {
+    border-radius: 50%;
+    padding: 12px;
+    background: rgba(0, 0, 0, 0.1);
+    border: 1px solid rgba(0, 0, 0, 0.2);
+    box-shadow: 0 1px rgba(255, 255, 255, 0.1);
+    font-size: 100%; }
+    .raven .powerstrip .button:hover {
+      background: rgba(0, 0, 0, 0.1);
+      border: 1px solid rgba(0, 0, 0, 0.2);
+      box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 1px 1px rgba(0, 0, 0, 0.2);
+      transition: 170ms ease all; }
+  .raven .option-subtitle {
+    font-size: smaller; }
+
+.raven-mpris {
+  border-width: 1px 0; }
+  .raven-mpris .button.image-button {
+    padding: 8px; }
+
+.budgie-notification-window {
+  border-radius: 1px; }
+
+.budgie-notification.background {
+  background-color: white;
+  border-radius: 4px; }
+.budgie-notification .notification-title {
+  font-size: 110%;
+  color: #444; }
+.budgie-notification .notification-body {
+  color: rgba(207, 216, 220, 0.7); }
+
+.drop-shadow, .budgie-session-dialog.background, .background.budgie-polkit-dialog {
+  box-shadow: 0 1px 1px 0 rgba(0, 0, 0, 0.2); }
+
+.budgie-session-dialog, .budgie-polkit-dialog {
+  padding: 12px;
+  border-radius: 4px;
+  border: none;
+  border-top: 1px solid rgba(255, 255, 255, 0.1); }
+  .budgie-session-dialog .linked.horizontal > .button, .budgie-polkit-dialog .linked.horizontal > .button {
+    border-bottom: none;
+    border-radius: 0; }
+    .budgie-session-dialog .linked.horizontal > .button:first-child, .budgie-polkit-dialog .linked.horizontal > .button:first-child {
+      border-left: none;
+      border-radius: 0 0 0 4px; }
+    .budgie-session-dialog .linked.horizontal > .button:last-child, .budgie-polkit-dialog .linked.horizontal > .button:last-child {
+      border-right: none;
+      border-radius: 0 0 4px 0; }
+
+.budgie-polkit-dialog .message {
+  color: rgba(207, 216, 220, 0.7); }
+.budgie-polkit-dialog .failure {
+  color: #F44336; }
 
 /***************
  * font-viewer *
@@ -7111,14 +7287,14 @@ ConversationListView {
   border-width: 0 1px 1px 1px; }
 
 #buttonbox_frame button {
-  color: #e4e6e7;
+  color: #cfd8dc;
   border-color: rgba(0, 0, 0, 0.7);
   background-image: linear-gradient(to bottom, rgba(32, 37, 38, 0.8));
   background-clip: padding-box;
   box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
   text-shadow: 0 1px black;
   -gtk-icon-shadow: 0 1px black;
-  outline-color: rgba(228, 230, 231, 0.3); }
+  outline-color: rgba(207, 216, 220, 0.3); }
   #buttonbox_frame button:hover {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -7127,7 +7303,7 @@ ConversationListView {
     box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
     text-shadow: 0 1px black;
     -gtk-icon-shadow: 0 1px black;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   #buttonbox_frame button:active, #buttonbox_frame button:checked {
     color: white;
     border-color: rgba(0, 0, 0, 0.7);
@@ -7136,11 +7312,11 @@ ConversationListView {
     box-shadow: none;
     text-shadow: none;
     -gtk-icon-shadow: none;
-    outline-color: rgba(228, 230, 231, 0.3); }
+    outline-color: rgba(207, 216, 220, 0.3); }
   #buttonbox_frame button:disabled {
-    color: #828687;
+    color: #787f81;
     border-color: rgba(0, 0, 0, 0.7);
-    background-image: linear-gradient(to bottom, rgba(52, 56, 57, 0.5));
+    background-image: linear-gradient(to bottom, rgba(50, 55, 56, 0.5));
     background-clip: padding-box;
     box-shadow: none;
     text-shadow: none;

src/gtk3/gtk3-assets-dark.svg

@@ -16,8 +16,8 @@
    height="232"
    id="svg11300"
    sodipodi:version="0.32"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.91 r"
-   sodipodi:docname="gtk3-assets.svg"
+   sodipodi:docname="gtk3-assets-dark.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
    style="display:inline;enable-background:new"
@@ -28,23 +28,23 @@
      stroke="#ef2929"
      fill="#f57900"
      id="base"
-     pagecolor="#4f585c"
+     pagecolor="#37474f"
      bordercolor="#666666"
      borderopacity="0.25490196"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="47.842387"
+     inkscape:cx="96.172341"
-     inkscape:cy="76.100391"
+     inkscape:cy="198.91621"
      inkscape:current-layer="layer2"
      showgrid="false"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
      inkscape:showpageshadow="false"
      inkscape:window-width="1920"
-     inkscape:window-height="1018"
+     inkscape:window-height="982"
      inkscape:window-x="0"
-     inkscape:window-y="32"
+     inkscape:window-y="34"
      width="400px"
      height="300px"
      inkscape:snap-nodes="true"
@@ -1886,50 +1886,50 @@
        inkscape:connector-curvature="0"
        id="path5066"
        d="m 24,119 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
     <path
        inkscape:connector-curvature="0"
        id="path5072"
        d="m 54,119 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
     <path
        inkscape:connector-curvature="0"
        id="path5076"
        d="m 84,119 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
     <path
        inkscape:connector-curvature="0"
        id="path5082"
        d="m 118,118 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
     <path
        inkscape:connector-curvature="0"
        id="path5088"
        d="m 148,118 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
     <path
        inkscape:connector-curvature="0"
        id="path5092"
        d="m 178,118 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
     <path
        sodipodi:nodetypes="ssssssssssssssssss"
        inkscape:connector-curvature="0"
        id="path5068"
        d="m 24,118 c -1.108,0 -2,0.892 -2,2 l 0,8 c 0,1.108 0.892,2 2,2 l 8,0 c 1.108,0 2,-0.892 2,-2 l 0,-8 c 0,-1.108 -0.892,-2 -2,-2 z m 0,1 8,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -8,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:new" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:new" />
     <path
        sodipodi:nodetypes="ssssssssssssssssss"
        inkscape:connector-curvature="0"
        id="path5074"
        d="m 54,118 c -1.108,0 -2,0.892 -2,2 l 0,8 c 0,1.108 0.892,2 2,2 l 8,0 c 1.108,0 2,-0.892 2,-2 l 0,-8 c 0,-1.108 -0.892,-2 -2,-2 z m 0,1 8,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -8,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new" />
     <path
        sodipodi:nodetypes="ssssssssssssssssss"
        inkscape:connector-curvature="0"
        id="path5078"
        d="m 84,118 c -1.108,0 -2,0.892 -2,2 l 0,8 c 0,1.108 0.892,2 2,2 l 8,0 c 1.108,0 2,-0.892 2,-2 l 0,-8 c 0,-1.108 -0.892,-2 -2,-2 z m 0,1 8,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -8,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new" />
     <path
        inkscape:connector-curvature="0"
        id="path5080"
@@ -1939,7 +1939,7 @@
        inkscape:connector-curvature="0"
        id="path5084"
        d="m 118,117 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new" />
     <circle
        r="3"
        cy="124"
@@ -1949,12 +1949,12 @@
     <path
        id="path5090"
        d="m 148,117 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
        inkscape:connector-curvature="0" />
     <path
        id="path5094"
        d="m 178,117 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
@@ -1962,7 +1962,7 @@
        d="m 174,123 8,0 0,2 -8,0 z"
        style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#a1a8ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 24,149 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="path4998"
        inkscape:connector-curvature="0" />
@@ -1979,7 +1979,7 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccscccccc" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 54,149 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="path5004"
        inkscape:connector-curvature="0" />
@@ -1990,7 +1990,7 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ssssssssssssssssss" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 84,149 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="path5008"
        inkscape:connector-curvature="0" />
@@ -2006,7 +2006,7 @@
        id="path5012"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 118,148 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path5014"
        inkscape:connector-curvature="0" />
@@ -2022,7 +2022,7 @@
        cy="154"
        r="3" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 148,148 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path5020"
        inkscape:connector-curvature="0" />
@@ -2032,7 +2032,7 @@
        d="m 148,147 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
        id="path5022" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 178,148 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path5024"
        inkscape:connector-curvature="0" />
@@ -2049,7 +2049,7 @@
     <path
        id="path4964"
        d="m 24,179 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:nodetypes="ssssssssssssssssss"
@@ -2066,7 +2066,7 @@
     <path
        id="path4970"
        d="m 54,179 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:nodetypes="ssssssssssssssssss"
@@ -2077,7 +2077,7 @@
     <path
        id="path4974"
        d="m 84,179 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        inkscape:connector-curvature="0" />
     <path
        sodipodi:nodetypes="ssssssssssssssssss"
@@ -2093,7 +2093,7 @@
     <path
        id="path4980"
        d="m 118,178 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        inkscape:connector-curvature="0" />
     <path
        id="path4982"
@@ -2109,7 +2109,7 @@
     <path
        id="path4986"
        d="m 148,178 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        inkscape:connector-curvature="0" />
     <path
        id="path4988"
@@ -2119,7 +2119,7 @@
     <path
        id="path4990"
        d="m 178,178 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        inkscape:connector-curvature="0" />
     <path
        id="path4992"
@@ -2133,7 +2133,7 @@
        inkscape:connector-curvature="0" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 24,237 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="rect4559" />
     <path
@@ -2150,7 +2150,7 @@
        sodipodi:nodetypes="ccccscccccc" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 54,237 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="rect4559-6" />
     <path
@@ -2161,7 +2161,7 @@
        sodipodi:nodetypes="ssssssssssssssssss" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 84,237 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="rect4559-8" />
     <path
@@ -2177,7 +2177,7 @@
        id="rect4664" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 118,236 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path4626" />
     <path
@@ -2193,7 +2193,7 @@
        id="path4707-8-2" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 148,236 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path4628" />
     <path
@@ -2203,7 +2203,7 @@
        id="path4805-2" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 178,236 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path4628-1" />
     <path
@@ -2220,7 +2220,7 @@
        inkscape:connector-curvature="0"
        id="path4930"
        d="m 24,267 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
     <path
        sodipodi:nodetypes="ssssssssssssssssss"
        inkscape:connector-curvature="0"
@@ -2237,7 +2237,7 @@
        inkscape:connector-curvature="0"
        id="path4936"
        d="m 54,267 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
     <path
        sodipodi:nodetypes="ssssssssssssssssss"
        inkscape:connector-curvature="0"
@@ -2248,7 +2248,7 @@
        inkscape:connector-curvature="0"
        id="path4940"
        d="m 84,267 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
     <path
        sodipodi:nodetypes="ssssssssssssssssss"
        inkscape:connector-curvature="0"
@@ -2264,7 +2264,7 @@
        inkscape:connector-curvature="0"
        id="path4946"
        d="m 118,266 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
     <path
        inkscape:connector-curvature="0"
        id="path4948"
@@ -2280,7 +2280,7 @@
        inkscape:connector-curvature="0"
        id="path4952"
        d="m 148,266 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
     <path
        id="path4954"
        d="m 148,265 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
@@ -2290,7 +2290,7 @@
        inkscape:connector-curvature="0"
        id="path4956"
        d="m 178,266 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate" />
     <path
        id="path4958"
        d="m 178,265 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
@@ -2303,7 +2303,7 @@
        style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#a1a8ab;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 24,207 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="path4532" />
     <path
@@ -2320,7 +2320,7 @@
        sodipodi:nodetypes="ccccscccccc" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 54,207 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="path4538" />
     <path
@@ -2331,7 +2331,7 @@
        sodipodi:nodetypes="ssssssssssssssssss" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 84,207 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="path4542" />
     <path
@@ -2347,7 +2347,7 @@
        id="path4546" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 118,206 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path4548" />
     <path
@@ -2363,7 +2363,7 @@
        id="circle4552" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 148,206 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path4554" />
     <path
@@ -2373,7 +2373,7 @@
        id="path4556" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 178,206 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path4558" />
     <path
@@ -2387,70 +2387,67 @@
        d="m 174,211 8,0 0,2 -8,0 z"
        id="path4562" />
     <path
-       sodipodi:nodetypes="ssssssssssssssssss"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
-       inkscape:connector-curvature="0"
+       d="m 54,87 c -1.644703,0 -3,1.355297 -3,3 l 0,8 c 0,1.644703 1.355297,3 3,3 l 8,0 c 1.644703,0 3,-1.355297 3,-3 l 0,-8 c 0,-1.644703 -1.355297,-3 -3,-3 l -8,0 z m 0,3 8,0 0,8 -8,0 0,-8 z"
        id="path4638"
-       d="m 54,88 c -1.108,0 -2,0.892 -2,2 l 0,8 c 0,1.108 0.892,2 2,2 l 8,0 c 1.108,0 2,-0.892 2,-2 l 0,-8 c 0,-1.108 -0.892,-2 -2,-2 z m 0,1 8,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -8,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z"
+       inkscape:connector-curvature="0" />
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#347d9f;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:new" />
     <path
-       sodipodi:nodetypes="ssssssssssssssssss"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
-       inkscape:connector-curvature="0"
+       d="m 84,87 c -1.644703,0 -3,1.355297 -3,3 l 0,8 c 0,1.644703 1.355297,3 3,3 l 8,0 c 1.644703,0 3,-1.355297 3,-3 l 0,-8 c 0,-1.644703 -1.355297,-3 -3,-3 l -8,0 z m 0,3 8,0 0,8 -8,0 0,-8 z"
        id="path4640"
-       d="m 84,88 c -1.108,0 -2,0.892 -2,2 l 0,8 c 0,1.108 0.892,2 2,2 l 8,0 c 1.108,0 2,-0.892 2,-2 l 0,-8 c 0,-1.108 -0.892,-2 -2,-2 z m 0,1 8,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -8,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z"
+       inkscape:connector-curvature="0" />
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#347d9f;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:new" />
     <path
-       inkscape:connector-curvature="0"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
+       d="m 118,86 c -4.40643,0 -8,3.593569 -8,8 0,4.406431 3.59357,8 8,8 4.40643,0 8,-3.593569 8,-8 0,-4.406431 -3.59357,-8 -8,-8 z m 0,3 c 2.77327,0 5,2.22673 5,5 0,2.77327 -2.22673,5 -5,5 -2.77327,0 -5,-2.22673 -5,-5 0,-2.77327 2.22673,-5 5,-5 z"
        id="path4642"
-       d="m 118,87 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
+       inkscape:connector-curvature="0" />
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#347d9f;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:new" />
     <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
+       d="m 148,86 c -4.40643,0 -8,3.593569 -8,8 0,4.406431 3.59357,8 8,8 4.40643,0 8,-3.593569 8,-8 0,-4.406431 -3.59357,-8 -8,-8 z m 0,3 c 2.77327,0 5,2.22673 5,5 0,2.77327 -2.22673,5 -5,5 -2.77327,0 -5,-2.22673 -5,-5 0,-2.77327 2.22673,-5 5,-5 z"
        id="path4644"
-       d="m 148,87 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#347d9f;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:new"
        inkscape:connector-curvature="0" />
     <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
+       d="m 178,86 c -4.40643,0 -8,3.593569 -8,8 0,4.406431 3.59357,8 8,8 4.40643,0 8,-3.593569 8,-8 0,-4.406431 -3.59357,-8 -8,-8 z m 0,3 c 2.77327,0 5,2.22673 5,5 0,2.77327 -2.22673,5 -5,5 -2.77327,0 -5,-2.22673 -5,-5 0,-2.77327 2.22673,-5 5,-5 z"
        id="path4646"
-       d="m 178,87 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#347d9f;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:new"
        inkscape:connector-curvature="0" />
     <path
-       sodipodi:nodetypes="ssssssssssssssssss"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:0.2;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:new"
-       inkscape:connector-curvature="0"
+       d="m 24,87 c -1.644703,0 -3,1.355297 -3,3 l 0,8 c 0,1.644703 1.355297,3 3,3 l 8,0 c 1.644703,0 3,-1.355297 3,-3 l 0,-8 c 0,-1.644703 -1.355297,-3 -3,-3 l -8,0 z m 0,3 8,0 0,8 -8,0 0,-8 z"
        id="path4648"
-       d="m 24,88 c -1.108,0 -2,0.892 -2,2 l 0,8 c 0,1.108 0.892,2 2,2 l 8,0 c 1.108,0 2,-0.892 2,-2 l 0,-8 c 0,-1.108 -0.892,-2 -2,-2 z m 0,1 8,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -8,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z"
+       inkscape:connector-curvature="0" />
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#347d9f;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:new" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 24,89 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="path4650"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 54,89 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="path4652"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 84,89 c -0.554,0 -1,0.446 -1,1 l 0,8 c 0,0.554 0.446,1 1,1 l 8,0 c 0.554,0 1,-0.446 1,-1 l 0,-8 c 0,-0.554 -0.446,-1 -1,-1 l -8,0 z"
        id="path4654"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 118,88 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path4656"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 148,88 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path4658"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#4f585c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#37474f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate"
        d="m 178,88 c -3.31371,0 -6,2.68629 -6,6 0,3.31371 2.68629,6 6,6 3.31371,0 6,-2.68629 6,-6 0,-3.31371 -2.68629,-6 -6,-6 z"
        id="path4660"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:new"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;marker:none;enable-background:new"
        d="m 24,88 c -1.108,0 -2,0.892 -2,2 l 0,8 c 0,1.108 0.892,2 2,2 l 8,0 c 1.108,0 2,-0.892 2,-2 l 0,-8 c 0,-1.108 -0.892,-2 -2,-2 z m 0,1 8,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -8,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z"
        id="path4662"
        inkscape:connector-curvature="0"
@@ -2462,13 +2459,13 @@
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccscccccc" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
        d="m 54,88 c -1.108,0 -2,0.892 -2,2 l 0,8 c 0,1.108 0.892,2 2,2 l 8,0 c 1.108,0 2,-0.892 2,-2 l 0,-8 c 0,-1.108 -0.892,-2 -2,-2 z m 0,1 8,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -8,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z"
        id="path4666"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ssssssssssssssssss" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
        d="m 84,88 c -1.108,0 -2,0.892 -2,2 l 0,8 c 0,1.108 0.892,2 2,2 l 8,0 c 1.108,0 2,-0.892 2,-2 l 0,-8 c 0,-1.108 -0.892,-2 -2,-2 z m 0,1 8,0 c 0.554,0 1,0.446 1,1 l 0,8 c 0,0.554 -0.446,1 -1,1 l -8,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-8 c 0,-0.554 0.446,-1 1,-1 z"
        id="path4668"
        inkscape:connector-curvature="0"
@@ -2479,7 +2476,7 @@
        id="path4670"
        inkscape:connector-curvature="0" />
     <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
        d="m 118,87 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
        id="path4672"
        inkscape:connector-curvature="0" />
@@ -2491,12 +2488,12 @@
        r="3" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
        d="m 148,87 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
        id="path4676" />
     <path
        inkscape:connector-curvature="0"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#347d9f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#57a4c8;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.5;marker:none;enable-background:new"
        d="m 178,87 c -3.86599,0 -7,3.13401 -7,7 0,3.86599 3.13401,7 7,7 3.86599,0 7,-3.13401 7,-7 0,-3.86599 -3.13401,-7 -7,-7 z m 0,1 c 3.31371,0 6,2.68629 6,6 0,3.31371 -2.68629,6 -6,6 -3.31371,0 -6,-2.68629 -6,-6 0,-3.31371 2.68629,-6 6,-6 z"
        id="path4678" />
     <path