more dark theme work

common/gtk-3.0/3.14/_applications.scss

@@ -40,8 +40,8 @@ TerminalWindow {
   .notebook {
 
     &.header.top {
-      box-shadow: inset 0  1px darken(opacify($header_bg, 1), 7%),
+      box-shadow: inset 0  1px if($variant == 'light', darken(opacify($header_bg, 1), 7%), darken(opacify($header_bg, 1), 5%)),
-                  inset 0 -1px lighten($borders_color, 5%);
+                  inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%));
     }
 
     tab {
@@ -52,15 +52,15 @@ TerminalWindow {
       }
 
       &.reorderable-page.top:hover {
-        border-bottom-color: darken(opacify($header_bg, 1), 7%);
+        border-bottom-color: if($variant == 'light', darken(opacify($header_bg, 1), 7%), darken(opacify($header_bg, 1), 5%));
       }
 
       &.reorderable-page.top:active,
       &.reorderable-page.top:active:hover {
         background-color: opacify($header_bg, 1);
-        border-color: darken(opacify($header_bg, 1), 7%);
+        border-color: if($variant == 'light', darken(opacify($header_bg, 1), 7%), darken(opacify($header_bg, 1), 5%));
 
-        &:backdrop { background-color: lighten($header_bg, 3%); }
+        &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
       }
     }
   }
@@ -137,7 +137,7 @@ NemoWindow .primary-toolbar NemoPathBar.linked > .button {
 //
 // Gedit
 //
-.gedit-headerbar-paned { color: darken($header_bg, 7%); }
+.gedit-headerbar-paned { color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); }
 
 .open-document-selector-listbox-row {
   border-bottom: 1px solid darken($bg_color, 5%);
@@ -549,9 +549,9 @@ MarlinViewWindow *:selected:focus {
 // Gala
 //
 .gala-notification {
-    border: 1px solid rgba(0, 0, 0, 0.35);
+    border: 1px solid if($variant=='light', rgba(0, 0, 0, 0.35), $borders_color);
     border-radius: 3px;
-	  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
     background-image: linear-gradient(to bottom, $base_color);
     background-color: transparent;
 
@@ -641,8 +641,8 @@ PantheonTerminalPantheonTerminalWindow.background {
   .notebook {
 
     &.header.top {
-      box-shadow: inset 0  1px darken(opacify($header_bg, 1), 7%),
+      box-shadow: inset 0  1px if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)),
-                  inset 0 -1px lighten($borders_color, 5%);
+                  inset 0 -1px if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%));
     }
   }
 }

common/gtk-3.0/3.14/_colors-public.scss

@@ -31,8 +31,8 @@
 @define-color placeholder_text_color #A8A8A8;
 
 //WM
-$wm_highlight: lighten(opacify($header_bg, 1), 4%);
+$wm_highlight: lighten(opacify($header_bg, 1), 3%);
-$wm_bg_unfocused: opacify(lighten($header_bg, 3%), 1);
+$wm_bg_unfocused: opacify($header_bg_backdrop, 1);
 
 @define-color wm_title #{"" + $header_fg};
 @define-color wm_unfocused_title alpha(#{"" + $header_fg}, 0.7);

common/gtk-3.0/3.14/_colors.scss

@@ -2,25 +2,27 @@
 // it gets @if ed depending on $variant
 
 
-$base_color: #ffffff;
+$base_color: if($variant =='light', #ffffff, #292D33);
-$text_color: #5c616c;
+$text_color: if($variant == 'light', #5c616c, #D3DAE3);
-$bg_color: #f9fafb;
+$bg_color: if($variant =='light', #f9fafb, #2F343B);
-$fg_color: #5c616c;
+$fg_color: if($variant =='light', #5c616c, #D3DAE3);
 
 $selected_fg_color: #ffffff;
 $selected_bg_color: #5294E2;
 $selected_borders_color: darken($selected_bg_color, 20%);
-$borders_color: darken($bg_color,9%);
+$borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,8%));
 
-$link_color: darken($selected_bg_color,10%);
+$link_color: if($variant == 'light', darken($selected_bg_color,10%),
-$link_visited_color: darken($selected_bg_color,20%);
+                                     lighten($selected_bg_color,20%));
+$link_visited_color: if($variant == 'light', darken($selected_bg_color,20%),
+                                     lighten($selected_bg_color,10%));
 
-$selection_mode_bg: transparentize($selected_bg_color, 0.05);
+$selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color);
 $warning_color: #F27835;
 $error_color: #FC4138;
 $success_color: #73d216;
 $destructive_color: #FA4349;
-$suggested_color: #9EA4B5;
+$suggested_color: if($variant == 'light', #9EA4B5, #5B5F69);
 
 $osd_fg_color: #A8ADB5;
 $osd_bg_color: transparentize(#3c4049, 0.05);
@@ -36,23 +38,29 @@ $tooltip_fg: #edf5fb;
 $tooltip_borders_color: transparentize(white, 0.9);
 
 //insensitive state derived colors
-$insensitive_fg_color: transparentize($fg_color, 0.45);
+$insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55));
-$insensitive_bg_color: mix($bg_color, $base_color, 40%);
+$insensitive_bg_color: if($variant == 'light', mix($bg_color, $base_color, 40%), lighten($bg_color, 2%));
 
 
 $entry_bg: $base_color;
-$entry_border: #cfd6e6;
+$entry_border: if($variant == 'light', #cfd6e6, #454a54);
 $entry_focus_border: $selected_bg_color;
 
-$button_bg: lighten($bg_color, 1%);
+$button_bg: if($variant == 'light', lighten($bg_color, 1%), darken($bg_color, 2%));
 $button_border: $entry_border;
 
-$header_bg: if($transparency == 'true', transparentize(#e7e8eb, 0.05), #e7e8eb);
+$header_bg: if($transparency == 'true' and $variant == 'light', transparentize(#e7e8eb, 0.05), #e7e8eb);
-$header_fg: saturate(transparentize($fg_color, 0.2), 10%);
+@if $variant==dark { $header_bg: if($transparency == 'true', transparentize(#25282E, 0.04), #25282E); }
+
+$header_bg_backdrop: if($variant == 'light', lighten($header_bg, 3%), lighten($header_bg, 1.5%));
+
+$header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%));
+
+$dark_sidebar_bg: if($transparency == 'true' and $variant == 'light', $osd_bg_color, opacify($osd_bg_color, 1));
+@if $variant==dark { $dark_sidebar_bg: if($transparency == 'true', darken($osd_bg_color, 5%), darken(opacify($osd_bg_color, 1), 5%)); }
 
-$dark_sidebar_bg: if($transparency == 'true', $osd_bg_color, opacify($osd_bg_color, 1));
 $dark_sidebar_fg: $osd_fg_color;
-$dark_sidebar_border: $dark_sidebar_bg;
+$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 7%));
 
-$panel_bg: darken($dark_sidebar_bg, 10%);
+$panel_bg: darken($osd_bg_color, 10%);
 $panel_fg: $dark_sidebar_fg;

common/gtk-3.0/3.14/_common.scss

@@ -3,6 +3,7 @@
 }
 
 $ease-out-quad: cubic-bezier(0.25, 0.46, 0.45, 0.94);
+$asset_suffix: if($variant=='dark', '-dark', ''); // use dark assets in dark variant
 
 * {
   background-clip: padding-box;
@@ -600,10 +601,11 @@ $_dot_color: $selected_bg_color;
                                     to(transparent));
     background-size: 6px 6px, 6px 6px;
     background-repeat: no-repeat;
-    background-position: right 3px, right 4px;
+    @if $variant == 'light' { background-position: right 3px, right 4px; }
-
+    @else { background-position: right 3px, right 2px; }
     &:dir(rtl) {
-      background-position: left 3px, left 4px;
+      @if $variant == 'light' { background-position: left 3px, left 4px; }
+      @else { background-position: left 3px, left 2px; }
     }
   }
 
@@ -984,7 +986,7 @@ GtkComboBox {
   border-image: linear-gradient(to bottom, opacify($header_bg, 1),
                                            darken($header_bg, 7%)) 1 0 1 0; //temporary hack for rhythmbox 3.1
 
-  &:backdrop { background-color: lighten(opacify($header_bg, 1), 3%); }
+  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
 
   .separator { @extend %header_separator; }
 
@@ -1022,7 +1024,7 @@ GtkComboBox {
   border-width: 0 0 1px;
   border-style: solid;
   border-radius: 0;
-  border-color: darken($header_bg, 7%);
+  border-color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%));
 
   color: $header_fg;
   background-color: opacify($header_bg, 1);
@@ -1031,9 +1033,9 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    background-color: lighten(opacify($header_bg, 1), 3%);
+    background-color: opacify($header_bg_backdrop, 1);
 
-    .csd & { background-color: lighten($header_bg, 3%); }  // Transparent header-bars only in csd windows
+    .csd & { background-color: $header_bg_backdrop; }  // Transparent header-bars only in csd windows
   }
 
   .title {
@@ -1116,7 +1118,7 @@ GtkComboBox {
   .maximized & {
     background-color: opacify($header_bg, 1);
 
-    &:backdrop { background-color: opacify(lighten($header_bg, 3%), 1); }
+    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
   }
 }
 
@@ -1132,19 +1134,18 @@ GtkComboBox {
 
   &:backdrop {
     color: transparentize($header_fg, 0.3);
-    background-color: opacify($header_bg, 1);
+    background-color: opacify($header_bg_backdrop, 1);
 
-    .csd & { background-color: lighten($header_bg, 3%); }
+    .csd & { background-color: $header_bg_backdrop; }
   }
 
   .maximized & {
     background-color: opacify($header_bg, 1);
 
-    &:backdrop { background-color: opacify(lighten($header_bg, 3%), 1); }
+    &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
   }
 }
 
-
 .titlebar .titlebar,
 .titlebar .titlebar:backdrop { background-color: transparent; }
 
@@ -1444,10 +1445,10 @@ column-header.button.dnd { // for treeview-like derive widgets
   border-style: none solid none none;
   border-radius: 0;
   border-image: linear-gradient(to bottom,
-                                transparentize(black, 1) 20%,
+                                transparentize(if($variant == 'light', black, white), 1) 20%,
-                                transparentize(black, 0.89) 20%,
+                                transparentize(if($variant == 'light', black, white), 0.89) 20%,
-                                transparentize(black, 0.89) 80%,
+                                transparentize(if($variant == 'light', black, white), 0.89) 80%,
-                                transparentize(black, 1) 80%) 0 1 0 0 / 0 1px 0 0 stretch;
+                                transparentize(if($variant == 'light', black, white), 1) 80%) 0 1 0 0 / 0 1px 0 0 stretch;
 
   &:active { background-color: $base_color; }
   &:insensitive {
@@ -1465,7 +1466,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   background-color: opacify($header_bg, 1);
   color: $header_fg;
 
-  &:backdrop { background-color: lighten(opacify($header_bg, 1), 3%); }
+  &:backdrop { background-color: opacify($header_bg_backdrop, 1); }
 
   & > .menuitem {
     padding: 6px 8px;
@@ -1487,7 +1488,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   margin: 4px;
   padding: 0;
   border-radius: 0;
-  background-color: $base_color;
+  background-color: if($variant == 'light', $base_color, darken($base_color, 3%));
   border: 1px solid $borders_color;
 
   .csd & {
@@ -1500,8 +1501,8 @@ column-header.button.dnd { // for treeview-like derive widgets
     padding: 5px;
     &:hover {
       color: $fg_color;
-      background-color: transparentize(black, 0.96);
+      background-color: if($variant == 'light', transparentize(black, 0.96), transparentize(white, 0.95));
-      border: solid transparentize(black, 0.92);
+      border: solid if($variant == 'light', transparentize(black, 0.92), transparentize(white, 0.93));
       border-width: 1px 0 1px 0;
     }
     &:insensitive {
@@ -1541,7 +1542,7 @@ column-header.button.dnd { // for treeview-like derive widgets
   border: 1px solid darken($borders_color, 5%);
   border-radius: 3px;
   background-clip: border-box;
-  background-color: $base_color;
+  background-color: if($variant == 'light', $base_color, darken($base_color, 3%));
 
   box-shadow: 0 2px 6px 1px transparentize(black, 0.93);
 
@@ -1613,7 +1614,7 @@ column-header.button.dnd { // for treeview-like derive widgets
       &.left { border-right-width: 0; }
     }
 
-    $_header_border: lighten($borders_color, 5%);
+    $_header_border: if($variant == 'light', lighten($borders_color, 5%), lighten($borders_color, 1%));
     &.top {
       box-shadow: inset 0 -1px $_header_border; // border
     }
@@ -1673,8 +1674,8 @@ column-header.button.dnd { // for treeview-like derive widgets
           border-width: 1px;
           border-#{$_tab}-width: 0;
           border-color: $borders_color;
-          background-color: transparentize(black, 0.98);
+          background-color: if($variant == 'light', transparentize(black, 0.98), transparentize(black, 0.9));
-          &:hover { background-color: transparentize(black, 0.98); }
+          &:hover { background-color: if($variant == 'light', transparentize(black, 0.98), transparentize(black, 0.9)); }
         }
       }
     }
@@ -1797,13 +1798,13 @@ GtkSwitch {
     // load switch troughs from .png files in assets directory
 
     #{$i}GtkSwitch.trough#{$k} {
-      background-image: -gtk-scaled(url("assets/switch#{$l}#{$j}.png"),url("assets/switch#{$l}#{$j}@2.png"));
+      background-image: -gtk-scaled(url("assets/switch#{$l}#{$j}#{$asset_suffix}.png"),url("assets/switch#{$l}#{$j}#{$asset_suffix}@2.png"));
     }
 
     // load switch sliders from .png files in assets directory
 
     //#{$i}GtkSwitch.slider#{$k} {
-    //  background-image: -gtk-scaled(url("assets/switch-slider#{$l}#{$j}.png"),url("assets/switch-slider#{$l}#{$j}@2.png"));
+    //  background-image: -gtk-scaled(url("assets/switch-slider#{$l}#{$j}#{$asset_suffix}.png"),url("assets/switch-slider#{$l}#{$j}#{$asset_suffix}@2.png"));
     //}
   }
 }
@@ -1826,8 +1827,8 @@ GtkSwitch {
                   (':checked', '-checked'),
                   (':checked:insensitive','-checked-insensitive') {
     .#{$w}#{$s} {
-      -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}.png"),
+      -gtk-icon-source: -gtk-scaled(url("assets/#{$a}#{$as}#{$asset_suffix}.png"),
-                                    url("assets/#{$a}#{$as}@2.png"));
+                                    url("assets/#{$a}#{$as}#{$asset_suffix}@2.png"));
     }
     // the borders of checks and radios are
     // too similar in luminosity to the selected background color, hence
@@ -1845,8 +1846,8 @@ GtkSwitch {
                   (':checked', '-checked-selectionmode') {
   GtkIconView.view.check#{$s},
   GtkFlowBox.view.check#{$s} {
-    -gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}.png"),
+    -gtk-icon-source: -gtk-scaled(url("assets/checkbox#{$as}#{$asset_suffix}.png"),
-                                    url("assets/checkbox#{$as}@2.png"));
+                                    url("assets/checkbox#{$as}#{$asset_suffix}@2.png"));
     background-color: transparent;
   }
 }
@@ -2119,7 +2120,7 @@ GtkScrolledWindow {
   border-radius: 0;   // and no rounded corners
   box-shadow: none;   // and no box-shadow
   &:hover {
-    background-color: transparentize(black, 0.95);
+    background-color: if($variant == 'light', transparentize(black, 0.95), transparentize(white, 0.97));
   }
   &:active {
     color: $fg_color;
@@ -2523,8 +2524,8 @@ GtkVolumeButton.button { padding: 8px; }
 
   // this needs to be transparent
   // see bug #722563
-  $_wm_border: transparentize(black, 0.9);
+  $_wm_border: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.35));
-  $_wm_border_backdrop: transparentize(black, 0.9);
+  $_wm_border_backdrop: if($variant=='light', transparentize(black, 0.9), transparentize(black, 0.35));
 
   box-shadow: 0 0 0 1px $_wm_border, 0 4px 8px 1px $_wm_border;
 
@@ -2540,8 +2541,8 @@ GtkVolumeButton.button { padding: 8px; }
   &.csd {
     &.popup, &.menu {
       border-radius: 3px;
-      box-shadow: 0 3px 6px $_wm_border,
+      box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)),
-                  0 0 0 1px $_wm_border;
+                  0 0 0 1px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1));
     }
     &.tooltip {
       border-radius: 2px;
@@ -2581,11 +2582,11 @@ GtkVolumeButton.button { padding: 8px; }
   .right:dir(rtl) .button.titlebutton:nth-child(3),
   .left .button.titlebutton:nth-child(3),
   .left:dir(rtl) .button.titlebutton:nth-last-child(3) {
-    background-image: -gtk-scaled(url('assets/titlebutton-min.png'),url('assets/titlebutton-min@2.png'));
+    background-image: -gtk-scaled(url('assets/titlebutton-min#{$asset_suffix}.png'),url('assets/titlebutton-min#{$asset_suffix}@2.png'));
 
-    &:hover, &:backdrop:hover { background-image: -gtk-scaled(url('assets/titlebutton-min-hover.png'),url('assets/titlebutton-min-hover@2.png')); }
+    &:hover, &:backdrop:hover { background-image: -gtk-scaled(url('assets/titlebutton-min-hover#{$asset_suffix}.png'),url('assets/titlebutton-min-hover#{$asset_suffix}@2.png')); }
-    &:active:hover { background-image: -gtk-scaled(url('assets/titlebutton-min-active.png'),url('assets/titlebutton-min-active@2.png')); }
+    &:active:hover { background-image: -gtk-scaled(url('assets/titlebutton-min-active#{$asset_suffix}.png'),url('assets/titlebutton-min-active#{$asset_suffix}@2.png')); }
-    &:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-min-backdrop.png'),url('assets/titlebutton-min-backdrop@2.png')); }
+    &:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-min-backdrop#{$asset_suffix}.png'),url('assets/titlebutton-min-backdrop#{$asset_suffix}@2.png')); }
 }
 
   // Maximize
@@ -2594,11 +2595,11 @@ GtkVolumeButton.button { padding: 8px; }
   .right:dir(rtl) .button.titlebutton:nth-child(2),
   .left .button.titlebutton:nth-child(2),
   .left:dir(rtl) .button.titlebutton:nth-last-child(2) {
-    background-image: -gtk-scaled(url('assets/titlebutton-max.png'),url('assets/titlebutton-max@2.png'));
+    background-image: -gtk-scaled(url('assets/titlebutton-max#{$asset_suffix}.png'),url('assets/titlebutton-max#{$asset_suffix}@2.png'));
 
-    &:hover, &:backdrop:hover { background-image: -gtk-scaled(url('assets/titlebutton-max-hover.png'),url('assets/titlebutton-max-hover@2.png')); }
+    &:hover, &:backdrop:hover { background-image: -gtk-scaled(url('assets/titlebutton-max-hover#{$asset_suffix}.png'),url('assets/titlebutton-max-hover#{$asset_suffix}@2.png')); }
-    &:active:hover { background-image: -gtk-scaled(url('assets/titlebutton-max-active.png'),url('assets/titlebutton-max-active@2.png')); }
+    &:active:hover { background-image: -gtk-scaled(url('assets/titlebutton-max-active#{$asset_suffix}.png'),url('assets/titlebutton-max-active#{$asset_suffix}@2.png')); }
-    &:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-max-backdrop.png'),url('assets/titlebutton-max-backdrop@2.png')); }
+    &:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-max-backdrop#{$asset_suffix}.png'),url('assets/titlebutton-max-backdrop#{$asset_suffix}@2.png')); }
 }
 
   // Close
@@ -2607,11 +2608,11 @@ GtkVolumeButton.button { padding: 8px; }
   .right:dir(rtl) .button.titlebutton:first-child,
   .left .button.titlebutton:first-child,
   .left:dir(rtl) .button.titlebutton:last-child {
-    background-image: -gtk-scaled(url('assets/titlebutton-close.png'),url('assets/titlebutton-close@2.png'));
+    background-image: -gtk-scaled(url('assets/titlebutton-close#{$asset_suffix}.png'),url('assets/titlebutton-close#{$asset_suffix}@2.png'));
 
-    &:hover, &:backdrop:hover { background-image: -gtk-scaled(url('assets/titlebutton-close-hover.png'),url('assets/titlebutton-close-hover@2.png')); }
+    &:hover, &:backdrop:hover { background-image: -gtk-scaled(url('assets/titlebutton-close-hover#{$asset_suffix}.png'),url('assets/titlebutton-close-hover#{$asset_suffix}@2.png')); }
-    &:active:hover { background-image: -gtk-scaled(url('assets/titlebutton-close-active.png'),url('assets/titlebutton-close-active@2.png')); }
+    &:active:hover { background-image: -gtk-scaled(url('assets/titlebutton-close-active#{$asset_suffix}.png'),url('assets/titlebutton-close-active#{$asset_suffix}@2.png')); }
-    &:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-close-backdrop.png'),url('assets/titlebutton-close-backdrop@2.png')); }
+    &:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-close-backdrop#{$asset_suffix}.png'),url('assets/titlebutton-close-backdrop#{$asset_suffix}@2.png')); }
   }
 }
 

common/gtk-3.0/3.14/_drawing.scss

@@ -57,8 +57,8 @@
   // normal header-bar entry
   //
     color: $header_fg;
-    border-color: transparentize($header_fg, 0.7);
+    border-color: if($variant == 'light', transparentize($header_fg, 0.7), darken($borders_color, 4%));
-    background-image: linear-gradient(to bottom, transparentize($base_color, 0.1));
+    background-image: linear-gradient(to bottom, if($variant == 'light', transparentize($base_color, 0.1), transparentize(darken($base_color, 4%), 0.1)));
     background-color: transparent;
 
     &.image, &.image:hover { color: inherit; }
@@ -78,7 +78,7 @@
   // insensitive header-bar entry
   //
     color: transparentize($header_fg, 0.45);
-    background-image: linear-gradient(to bottom, transparentize($base_color, 0.45));
+    background-image: linear-gradient(to bottom, if($variant == 'light', transparentize($base_color, 0.45), transparentize(darken($base_color, 4%), 0.45)));
   }
 
   @if $t==osd {
@@ -192,8 +192,8 @@
   //
     color: $header_fg;
     outline-color: transparentize($header_fg, 0.7);
-    border-color: transparentize($header_fg, 0.7);
+    border-color: if($variant == 'light', transparentize($header_fg, 0.7), darken($borders_color, 4%));
-    background-color: transparentize($button_bg, 0.1);
+    background-color: if($variant == 'light', transparentize($button_bg, 0.1), transparentize(darken($button_bg, 4%), 0.1));
   }
 
   @else if $t==header-active {

common/gtk-3.0/3.14/_transparent_widgets.scss

@@ -1,5 +1,5 @@
 .titlebar .separator {
-  color: darken($header_bg, 7%);  //fixes separator in gnome-tweak-tool
+  color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%));  //fixes separator in gnome-tweak-tool
 }
 
 GtkFileChooserDialog .dialog-action-box { background-color: $bg_color }  // fix for non gnome environments
@@ -12,6 +12,16 @@ NemoWindow {
   -GtkPaned-handle-size: 0;
 }
 
+@if $variant==dark {
+  GtkFileChooserDialog,
+  NautilusWindow ,
+  NemoWindow {
+    .sidebar { box-shadow: inset -1px 0 $dark_sidebar_border; }
+
+    .sidebar:dir(rtl) { box-shadow: inset 1px 0 $dark_sidebar_border; }
+  }
+}
+
 // Dark transparent sidebars
 GtkFileChooserDialog,
 NautilusWindow,
@@ -85,7 +95,7 @@ GeditWindow.background.csd {
   .pane-separator,
   .pane-separator:hover { background-color: $dark_sidebar_border; }
 
-  .titlebar .pane-separator { background-color: darken($header_bg, 7%); }
+  .titlebar .pane-separator { background-color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); }
 }
 
 .gedit-bottom-panel-paned { background-color: $base_color; }

common/gtk-3.0/3.14/_unity.scss

@@ -30,13 +30,13 @@ UnityDecoration {
 
     &:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, lighten(opacify($header_bg, 1), 3%));
+      background-image: linear-gradient(to bottom, opacify($header_bg_backdrop, 1));
       color: transparentize($header_fg, 0.3);
     }
   }
   &.left, &.right, &.bottom,
   &.left:backdrop, &.right:backdrop, &.bottom:backdrop {
-    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1));
+    background-image: linear-gradient(to bottom, if($variant == 'light', rgba(0, 0, 0, 0.1), rgba(0,0,0,0.25)));
   }
 }
 

common/gtk-3.0/3.14/assets.txt

@@ -48,3 +48,37 @@ titlebutton-min
 titlebutton-min-backdrop
 titlebutton-min-hover
 titlebutton-min-active
+checkbox-checked-dark
+checkbox-checked-insensitive-dark
+checkbox-unchecked-dark
+checkbox-unchecked-insensitive-dark
+checkbox-mixed-dark
+checkbox-mixed-insensitive-dark
+checkbox-checked-selectionmode-dark
+checkbox-selectionmode-dark
+radio-checked-dark
+radio-checked-insensitive-dark
+radio-unchecked-dark
+radio-unchecked-insensitive-dark
+radio-mixed-dark
+radio-mixed-insensitive-dark
+switch-dark
+switch-active-dark
+switch-insensitive-dark
+switch-active-insensitive-dark
+switch-header-dark
+switch-active-header-dark
+switch-insensitive-header-dark
+switch-active-insensitive-header-dark
+titlebutton-close-dark
+titlebutton-close-backdrop-dark
+titlebutton-close-hover-dark
+titlebutton-close-active-dark
+titlebutton-max-dark
+titlebutton-max-backdrop-dark
+titlebutton-max-hover-dark
+titlebutton-max-active-dark
+titlebutton-min-dark
+titlebutton-min-backdrop-dark
+titlebutton-min-hover-dark
+titlebutton-min-active-dark

common/gtk-3.0/3.14/gtk-contained-dark.scss

@@ -0,0 +1,16 @@
+// General guidelines:
+// - very unlikely you want to edit something else than _common.scss
+// - keep the number of defined colors to a minimum, use the color blending functions if
+//   you need a subtle shade
+
+$variant: 'dark';
+$transparency: 'true';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'applications';
+@import 'unity';
+@import 'granite';
+@import 'transparent_widgets';
+@import 'colors-public';

common/gtk-3.0/3.14/gtk-contained-solid-dark.scss

@@ -0,0 +1,16 @@
+// General guidelines:
+// - very unlikely you want to edit something else than _common.scss
+// - keep the number of defined colors to a minimum, use the color blending functions if
+//   you need a subtle shade
+
+$variant: 'dark';
+$transparency: 'false';
+
+@import 'colors';
+@import 'drawing';
+@import 'common';
+@import 'applications';
+@import 'unity';
+@import 'granite';
+@import 'transparent_widgets';
+@import 'colors-public';

common/gtk-3.0/3.14/gtk-contained-solid.css

@@ -794,11 +794,11 @@ GtkComboBox {
     padding: 0 12px; }
   .header-bar.selection-mode {
     color: #ffffff;
-    background-color: rgba(82, 148, 226, 0.95);
+    background-color: #5294E2;
-    border-color: rgba(65, 137, 223, 0.95);
+    border-color: #4189df;
     box-shadow: none; }
     .header-bar.selection-mode:backdrop {
-      background-color: rgba(82, 148, 226, 0.95);
+      background-color: #5294E2;
       color: rgba(255, 255, 255, 0.6); }
     .header-bar.selection-mode .button {
       color: #ffffff;
@@ -857,7 +857,7 @@ GtkComboBox {
     background-color: #e7e8eb; }
   .titlebar:backdrop {
     color: rgba(82, 93, 118, 0.5);
-    background-color: #e7e8eb; }
+    background-color: #eff0f2; }
     .csd .titlebar:backdrop {
       background-color: #eff0f2; }
   .maximized .titlebar {
@@ -2651,7 +2651,7 @@ PanelWidget,
 PanelAppletFrame,
 PanelApplet {
   color: #A8ADB5;
-  background-image: linear-gradient(to bottom, #25272d); }
+  background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); }
 
 PanelApplet .button, PanelApplet .button:backdrop {
   padding: 4px;
@@ -2694,18 +2694,18 @@ ClockBox {
   color: #A8ADB5; }
 
 .xfce4-panel.panel {
-  background-color: #25272d; }
+  background-color: rgba(37, 39, 45, 0.95); }
   .xfce4-panel.panel .button.flat {
     color: #A8ADB5;
     background-color: rgba(37, 39, 45, 0);
     border-radius: 0; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
-      background-color: #3c4049; }
+      background-color: rgba(60, 64, 73, 0.95); }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
       color: #5294E2;
       border: none;
-      background-color: #151619; }
+      background-color: rgba(21, 22, 25, 0.95); }
 
 .floating-bar {
   background-color: #5294E2;
@@ -3366,6 +3366,6 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_unfocused_title alpha(rgba(82, 93, 118, 0.8), 0.7);
 @define-color wm_bg #e7e8eb;
 @define-color wm_bg_unfocused #eff0f2;
-@define-color wm_highlight #f2f3f4;
+@define-color wm_highlight #eff0f2;
 @define-color wm_shadow alpha(black, 0.35);
 @define-color content_view_bg #ffffff;

common/gtk-3.0/3.14/gtk-contained-solid.scss

@@ -3,6 +3,7 @@
 // - keep the number of defined colors to a minimum, use the color blending functions if
 //   you need a subtle shade
 
+$variant: 'light';
 $transparency: 'false';
 
 @import 'colors';

common/gtk-3.0/3.14/gtk-contained.css

@@ -857,7 +857,7 @@ GtkComboBox {
     background-color: rgba(231, 232, 235, 0.95); }
   .titlebar:backdrop {
     color: rgba(82, 93, 118, 0.5);
-    background-color: #e7e8eb; }
+    background-color: #eff0f2; }
     .csd .titlebar:backdrop {
       background-color: rgba(239, 240, 242, 0.95); }
   .maximized .titlebar {
@@ -2401,7 +2401,7 @@ TerminalWindow .notebook tab.reorderable-page.top:active, TerminalWindow .notebo
   background-color: #e7e8eb;
   border-color: #d4d5db; }
   TerminalWindow .notebook tab.reorderable-page.top:active:backdrop, TerminalWindow .notebook tab.reorderable-page.top:active:hover:backdrop {
-    background-color: rgba(239, 240, 242, 0.95); }
+    background-color: #eff0f2; }
 TerminalWindow .scrollbar.vertical .slider {
   margin-left: 3px; }
 TerminalWindow .scrollbar.trough {
@@ -2834,7 +2834,7 @@ MarlinViewWindow *:selected:focus {
 PantheonTerminalPantheonTerminalWindow.background {
   background-color: transparent; }
   PantheonTerminalPantheonTerminalWindow.background .notebook.header.top {
-    box-shadow: inset 0 1px #d4d5db, inset 0 -1px #edf0f3; }
+    box-shadow: inset 0 1px rgba(212, 213, 219, 0.95), inset 0 -1px #edf0f3; }
 
 SwitchboardCategoryView .view:selected,
 SwitchboardCategoryView .view:selected:focus {
@@ -3366,6 +3366,6 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_unfocused_title alpha(rgba(82, 93, 118, 0.8), 0.7);
 @define-color wm_bg #e7e8eb;
 @define-color wm_bg_unfocused #eff0f2;
-@define-color wm_highlight #f2f3f4;
+@define-color wm_highlight #eff0f2;
 @define-color wm_shadow alpha(black, 0.35);
 @define-color content_view_bg #ffffff;

common/gtk-3.0/3.14/gtk-contained.scss

@@ -3,6 +3,7 @@
 // - keep the number of defined colors to a minimum, use the color blending functions if
 //   you need a subtle shade
 
+$variant: 'light';
 $transparency: 'true';
 
 @import 'colors';

common/gtk-3.0/3.14/gtk-dark.css

@@ -0,0 +1 @@
+@import url("gtk-contained-dark.css");

common/gtk-3.0/3.16/_applications.scss

@@ -597,9 +597,9 @@ MarlinViewWindow *:selected:focus {
 // Gala
 //
 .gala-notification {
-    border: 1px solid rgba(0, 0, 0, 0.35);
+    border: 1px solid if($variant=='light', rgba(0, 0, 0, 0.35), $borders_color);
     border-radius: 3px;
-	  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
     background-image: linear-gradient(to bottom, $base_color);
     background-color: transparent;
 
@@ -686,7 +686,6 @@ MarlinViewWindow *:selected:focus {
 PantheonTerminalPantheonTerminalWindow.background {
    background-color: transparent;
 
-
   .notebook {
 
     &.header.top {

common/gtk-3.0/3.16/_colors-public.scss

@@ -31,8 +31,8 @@
 @define-color placeholder_text_color #A8A8A8;
 
 //WM
-$wm_highlight: lighten(opacify($header_bg, 1), 4%);
+$wm_highlight: lighten(opacify($header_bg, 1), 3%);
-$wm_bg_unfocused: opacify(lighten($header_bg, 3%), 1);
+$wm_bg_unfocused: opacify($header_bg_backdrop, 1);
 
 @define-color wm_title #{"" + $header_fg};
 @define-color wm_unfocused_title alpha(#{"" + $header_fg}, 0.7);

common/gtk-3.0/3.16/_colors.scss

@@ -22,7 +22,7 @@ $warning_color: #F27835;
 $error_color: #FC4138;
 $success_color: #73d216;
 $destructive_color: #FA4349;
-$suggested_color: #9EA4B5;
+$suggested_color: if($variant == 'light', #9EA4B5, #5B5F69);
 
 $osd_fg_color: #A8ADB5;
 $osd_bg_color: transparentize(#3c4049, 0.05);
@@ -50,15 +50,17 @@ $button_bg: if($variant == 'light', lighten($bg_color, 1%), darken($bg_color, 2%
 $button_border: $entry_border;
 
 $header_bg: if($transparency == 'true' and $variant == 'light', transparentize(#e7e8eb, 0.05), #e7e8eb);
-@if $variant==dark { $header_bg: if($transparency == 'true', transparentize(#272A30, 0.04), #272A30); }
+@if $variant==dark { $header_bg: if($transparency == 'true', transparentize(#25282E, 0.04), #25282E); }
 
 $header_bg_backdrop: if($variant == 'light', lighten($header_bg, 3%), lighten($header_bg, 1.5%));
 
-$header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.3), 10%));
+$header_fg: if($variant == 'light', saturate(transparentize($fg_color, 0.2), 10%), saturate(transparentize($fg_color, 0.2), 10%));
+
+$dark_sidebar_bg: if($transparency == 'true' and $variant == 'light', $osd_bg_color, opacify($osd_bg_color, 1));
+@if $variant==dark { $dark_sidebar_bg: if($transparency == 'true', darken($osd_bg_color, 5%), darken(opacify($osd_bg_color, 1), 5%)); }
 
-$dark_sidebar_bg: if($transparency == 'true', $osd_bg_color, opacify($osd_bg_color, 1));
 $dark_sidebar_fg: $osd_fg_color;
-$dark_sidebar_border: $dark_sidebar_bg;
+$dark_sidebar_border: if($variant == 'light', $dark_sidebar_bg, darken($dark_sidebar_bg, 7%));
 
-$panel_bg: darken($dark_sidebar_bg, 10%);
+$panel_bg: darken($osd_bg_color, 10%);
 $panel_fg: $dark_sidebar_fg;

common/gtk-3.0/3.16/_common.scss

@@ -601,10 +601,11 @@ $_dot_color: $selected_bg_color;
                                     to(transparent));
     background-size: 6px 6px, 6px 6px;
     background-repeat: no-repeat;
-    background-position: right 3px, right 4px;
+    @if $variant == 'light' { background-position: right 3px, right 4px; }
-
+    @else { background-position: right 3px, right 2px; }
     &:dir(rtl) {
-      background-position: left 3px, left 4px;
+      @if $variant == 'light' { background-position: left 3px, left 4px; }
+      @else { background-position: left 3px, left 2px; }
     }
   }
 
@@ -1188,6 +1189,8 @@ GtkComboBox {
     &:focus {
       @include entry(header-focus);
       background-clip: border-box;
+
+      &.image { color: $selected_fg_color; }
     }
     &:insensitive { @include entry(header-insensitive); }
 
@@ -1465,10 +1468,10 @@ column-header.button.dnd { // for treeview-like derive widgets
   border-style: none solid none none;
   border-radius: 0;
   border-image: linear-gradient(to bottom,
-                                transparentize(black, 1) 20%,
+                                transparentize(if($variant == 'light', black, white), 1) 20%,
-                                transparentize(black, 0.89) 20%,
+                                transparentize(if($variant == 'light', black, white), 0.89) 20%,
-                                transparentize(black, 0.89) 80%,
+                                transparentize(if($variant == 'light', black, white), 0.89) 80%,
-                                transparentize(black, 1) 80%) 0 1 0 0 / 0 1px 0 0 stretch;
+                                transparentize(if($variant == 'light', black, white), 1) 80%) 0 1 0 0 / 0 1px 0 0 stretch;
 
   &:active { background-color: $base_color; }
   &:insensitive {
@@ -2226,7 +2229,7 @@ GtkScrolledWindow {
   border-radius: 0;   // and no rounded corners
   box-shadow: none;   // and no box-shadow
   &:hover {
-    background-color: transparentize(black, 0.95);
+    background-color: if($variant == 'light', transparentize(black, 0.95), transparentize(white, 0.97));
   }
   &:active {
     color: $fg_color;
@@ -2675,8 +2678,8 @@ GtkVolumeButton.button { padding: 8px; }
   &.csd {
     &.popup, &.menu {
       border-radius: 3px;
-      box-shadow: 0 3px 6px $_wm_border,
+      box-shadow: 0 3px 6px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1)),
-                  0 0 0 1px $_wm_border;
+                  0 0 0 1px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.1));
     }
     &.tooltip {
       border-radius: 2px;

common/gtk-3.0/3.16/_drawing.scss

@@ -78,7 +78,7 @@
   // insensitive header-bar entry
   //
     color: transparentize($header_fg, 0.45);
-    background-image: linear-gradient(to bottom, if($variant == 'light', transparentize($base_color, 0.45), transparentize(darken($base_color, 2%), 0.45)));
+    background-image: linear-gradient(to bottom, if($variant == 'light', transparentize($base_color, 0.45), transparentize(darken($base_color, 4%), 0.45)));
   }
 
   @if $t==osd {
@@ -192,8 +192,8 @@
   //
     color: $header_fg;
     outline-color: transparentize($header_fg, 0.7);
-    border-color: if($variant == 'light', transparentize($header_fg, 0.7), darken($borders_color, 1%));
+    border-color: if($variant == 'light', transparentize($header_fg, 0.7), darken($borders_color, 4%));
-    background-color: if($variant == 'light', transparentize($button_bg, 0.1), transparentize(darken($button_bg, 3%), 0.1));
+    background-color: if($variant == 'light', transparentize($button_bg, 0.1), transparentize(darken($button_bg, 4%), 0.1));
   }
 
   @else if $t==header-active {

common/gtk-3.0/3.16/_transparent_widgets.scss

@@ -1,5 +1,5 @@
 .titlebar .separator {
-  color: darken($header_bg, 7%);  //fixes separator in gnome-tweak-tool
+  color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%));  //fixes separator in gnome-tweak-tool
 }
 
 GtkFileChooserDialog .dialog-action-box { background-color: $bg_color }  // fix for non gnome environments
@@ -12,6 +12,16 @@ NemoWindow {
   -GtkPaned-handle-size: 0;
 }
 
+@if $variant==dark {
+  GtkFileChooserDialog,
+  NautilusWindow ,
+  NemoWindow {
+    .sidebar { box-shadow: inset -1px 0 $dark_sidebar_border; }
+
+    .sidebar:dir(rtl) { box-shadow: inset 1px 0 $dark_sidebar_border; }
+  }
+}
+
 // Dark transparent sidebars
 GtkFileChooserDialog,
 NautilusWindow,
@@ -84,7 +94,7 @@ GeditWindow.background.csd {
   .pane-separator,
   .pane-separator:hover { background-color: $dark_sidebar_border; }
 
-  .titlebar .pane-separator { background-color: darken($header_bg, 7%); }
+  .titlebar .pane-separator { background-color: if($variant == 'light', darken($header_bg, 7%), darken($header_bg, 5%)); }
 }
 
 .gedit-bottom-panel-paned { background-color: $base_color; }

common/gtk-3.0/3.16/_unity.scss

@@ -30,13 +30,13 @@ UnityDecoration {
 
     &:backdrop {
       border-bottom-width: 0;
-      background-image: linear-gradient(to bottom, lighten(opacify($header_bg, 1), 3%));
+      background-image: linear-gradient(to bottom, opacify($header_bg_backdrop, 1));
       color: transparentize($header_fg, 0.3);
     }
   }
   &.left, &.right, &.bottom,
   &.left:backdrop, &.right:backdrop, &.bottom:backdrop {
-    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1));
+    background-image: linear-gradient(to bottom, if($variant == 'light', rgba(0, 0, 0, 0.1), rgba(0,0,0,0.25)));
   }
 }
 

common/gtk-3.0/3.16/assets.svg

@@ -24,9 +24,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2"
+     inkscape:zoom="1"
-     inkscape:cx="379.80628"
+     inkscape:cx="429.59157"
-     inkscape:cy="195.09285"
+     inkscape:cy="287.60258"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -3488,7 +3488,7 @@
                  height="1.9999826"
                  width="5"
                  id="rect3977-39-90"
-                 style="fill:#ffffff;fill-opacity:1;stroke:none" />
+                 style="fill:#292d33;fill-opacity:1;stroke:none" />
               <rect
                  ry="0"
                  y="1027.3622"
@@ -3496,7 +3496,7 @@
                  height="7.9999828"
                  width="2"
                  id="rect3979-7-60"
-                 style="fill:#ffffff;fill-opacity:1;stroke:none" />
+                 style="fill:#292d33;fill-opacity:1;stroke:none" />
             </g>
             <rect
                style="fill:#eeeeee;fill-opacity:0;stroke:none"
@@ -3587,7 +3587,7 @@
                  height="7.9999828"
                  width="2"
                  id="rect3979-7-3-4"
-                 style="fill:#ffffff;fill-opacity:1;stroke:none"
+                 style="fill:#292d33;fill-opacity:1;stroke:none"
                  transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
             </g>
             <rect
@@ -3669,7 +3669,7 @@
          height="4"
          width="4"
          id="use15101-5-7-55"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#292d33;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
          ry="2" />
     </g>
     <g
@@ -3734,7 +3734,7 @@
            height="7.9999828"
            width="2"
            id="rect3979-7-3-9-5"
-           style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+           style="display:inline;fill:#292d33;fill-opacity:1;stroke:none"
            transform="matrix(0,-1,1,0,0,0)" />
       </g>
     </g>
@@ -3773,7 +3773,7 @@
                ry="11"
                rx="11" />
             <circle
-               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:#292d33;fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="path3759-0-75"
                cx="41"
                cy="1041.3622"
@@ -3793,7 +3793,7 @@
            height="1.9999826"
            width="5"
            id="rect3977-39-2-13"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:#292d33;fill-opacity:1;stroke:none" />
         <rect
            transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
            ry="0"
@@ -3802,7 +3802,7 @@
            height="7.9999828"
            width="2"
            id="rect3979-7-0-65"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:#292d33;fill-opacity:1;stroke:none" />
       </g>
     </g>
     <g
@@ -3851,7 +3851,7 @@
          inkscape:connector-curvature="0"
          d="m 1043.0028,337 0.75,0 c 0.01,-9e-5 0.016,-3.5e-4 0.023,0 0.1912,0.008 0.3824,0.0964 0.5156,0.23437 l 1.711,1.71094 1.7343,-1.71094 c 0.1993,-0.17287 0.335,-0.22912 0.5157,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.026,0.41298 -0.1875,0.5625 l -1.711,1.71093 1.6875,1.6875 c 0.1412,0.14113 0.211,0.34009 0.211,0.53907 l 0,0.75 -0.75,0 c -0.199,-10e-6 -0.398,-0.0698 -0.5391,-0.21094 l -1.7109,-1.71094 -1.711,1.71094 c -0.1411,0.14114 -0.3401,0.21094 -0.539,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.07,-0.39794 0.2109,-0.53907 l 1.7109,-1.6875 -1.7109,-1.71093 c -0.1581,-0.14598 -0.2274,-0.35194 -0.2109,-0.5625 l 0,-0.75 z"
          id="path10839-9-8-2-2-5-46"
-         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#292d33;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#292d33;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
     <g
        transform="translate(-704.99998,-618.63782)"
@@ -3888,7 +3888,7 @@
                ry="11"
                rx="11" />
             <circle
-               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:#292d33;fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="path3759-0-8-4"
                cx="41"
                cy="1041.3622"
@@ -3908,7 +3908,7 @@
            height="1.9999826"
            width="5"
            id="rect3977-39-2-3-6"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:#292d33;fill-opacity:1;stroke:none" />
         <rect
            transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
            ry="0"
@@ -3917,7 +3917,7 @@
            height="7.9999828"
            width="2"
            id="rect3979-7-0-6-69"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:#292d33;fill-opacity:1;stroke:none" />
       </g>
     </g>
     <g
@@ -3966,7 +3966,7 @@
          inkscape:connector-curvature="0"
          d="m 1043.0028,337 0.75,0 c 0.01,-9e-5 0.016,-3.5e-4 0.023,0 0.1912,0.008 0.3824,0.0964 0.5156,0.23437 l 1.711,1.71094 1.7343,-1.71094 c 0.1993,-0.17287 0.335,-0.22912 0.5157,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.026,0.41298 -0.1875,0.5625 l -1.711,1.71093 1.6875,1.6875 c 0.1412,0.14113 0.211,0.34009 0.211,0.53907 l 0,0.75 -0.75,0 c -0.199,-10e-6 -0.398,-0.0698 -0.5391,-0.21094 l -1.7109,-1.71094 -1.711,1.71094 c -0.1411,0.14114 -0.3401,0.21094 -0.539,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.07,-0.39794 0.2109,-0.53907 l 1.7109,-1.6875 -1.7109,-1.71093 c -0.1581,-0.14598 -0.2274,-0.35194 -0.2109,-0.5625 l 0,-0.75 z"
          id="path10839-9-8-2-2-5-5-5"
-         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#292d33;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#292d33;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
     <g
        transform="translate(220.00001,-229.00001)"
@@ -4134,7 +4134,7 @@
                  height="1.9999826"
                  width="5"
                  id="rect3977-39-0-3"
-                 style="fill:#ffffff;fill-opacity:1;stroke:none" />
+                 style="fill:#292d33;fill-opacity:1;stroke:none" />
               <rect
                  ry="0"
                  y="1027.3622"
@@ -4142,7 +4142,7 @@
                  height="7.9999828"
                  width="2"
                  id="rect3979-7-6-9"
-                 style="fill:#ffffff;fill-opacity:1;stroke:none" />
+                 style="fill:#292d33;fill-opacity:1;stroke:none" />
             </g>
             <rect
                style="fill:#eeeeee;fill-opacity:0;stroke:none"
@@ -4233,7 +4233,7 @@
                  height="7.9999828"
                  width="2"
                  id="rect3979-7-3-91-5"
-                 style="fill:#ffffff;fill-opacity:1;stroke:none"
+                 style="fill:#292d33;fill-opacity:1;stroke:none"
                  transform="matrix(-0.70710678,-0.70710678,0.70710678,-0.70710678,0,0)" />
             </g>
             <rect
@@ -4315,7 +4315,7 @@
          height="4"
          width="4"
          id="use15101-5-7-2-5"
-         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#292d33;fill-opacity:1;stroke:none;stroke-width:2.08838987;marker:none;enable-background:accumulate"
          ry="2" />
     </g>
     <g
@@ -4380,7 +4380,7 @@
            height="7.9999828"
            width="2"
            id="rect3979-7-3-9-3-37"
-           style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+           style="display:inline;fill:#292d33;fill-opacity:1;stroke:none"
            transform="matrix(0,-1,1,0,0,0)" />
       </g>
     </g>
@@ -4490,7 +4490,7 @@
          transform="translate(-2.2045153,1.9730481)"
          id="g14051-7">
         <path
-           style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none"
+           style="display:inline;fill:#292d33;fill-opacity:1;stroke:none"
            d="m 491.36072,188.95163 -9.5312,9.5625 -4.7812,-4.78125 -3.1876,3.1875 4.7813,4.78125 3.1875,3.1875 3.1562,-3.1875 9.5626,-9.5625 -3.1876,-3.1875 z"
            id="rect3977-39-35-1-3-50"
            inkscape:connector-curvature="0" />
@@ -4573,7 +4573,7 @@
                ry="11"
                rx="11.000001" />
             <circle
-               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:#292d33;fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="path3759-0-9-7"
                cx="41"
                cy="1041.3622"
@@ -4593,7 +4593,7 @@
            height="1.9999826"
            width="5"
            id="rect3977-39-2-6-0"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:#292d33;fill-opacity:1;stroke:none" />
         <rect
            transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
            ry="0"
@@ -4602,7 +4602,7 @@
            height="7.9999828"
            width="2"
            id="rect3979-7-0-5-9"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:#292d33;fill-opacity:1;stroke:none" />
       </g>
     </g>
     <g
@@ -4630,7 +4630,7 @@
                x="0"
                y="1029.3622" />
             <rect
-               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:#181a1e;fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="rect2987-07-5-3"
                width="50"
                height="20"
@@ -4639,7 +4639,7 @@
                ry="11"
                rx="11.000001" />
             <circle
-               style="fill:#cfd6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:#9ba3ae;fill-opacity:1;fill-rule:nonzero;stroke:none;opacity:0.7"
                id="path3759-7-8-7"
                cx="41"
                cy="1041.3622"
@@ -4651,7 +4651,7 @@
          inkscape:connector-curvature="0"
          d="m 1043.0028,337 0.75,0 c 0.01,-9e-5 0.016,-3.5e-4 0.023,0 0.1912,0.008 0.3824,0.0964 0.5156,0.23437 l 1.711,1.71094 1.7343,-1.71094 c 0.1993,-0.17287 0.335,-0.22912 0.5157,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.026,0.41298 -0.1875,0.5625 l -1.711,1.71093 1.6875,1.6875 c 0.1412,0.14113 0.211,0.34009 0.211,0.53907 l 0,0.75 -0.75,0 c -0.199,-10e-6 -0.398,-0.0698 -0.5391,-0.21094 l -1.7109,-1.71094 -1.711,1.71094 c -0.1411,0.14114 -0.3401,0.21094 -0.539,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.07,-0.39794 0.2109,-0.53907 l 1.7109,-1.6875 -1.7109,-1.71093 c -0.1581,-0.14598 -0.2274,-0.35194 -0.2109,-0.5625 l 0,-0.75 z"
          id="path10839-9-8-2-2-5-4-1"
-         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#5c616c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ba3ae;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
     <g
        transform="translate(-583.99997,-618.63782)"
@@ -4688,7 +4688,7 @@
                ry="11"
                rx="11.000001" />
             <circle
-               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:#292d33;fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="path3759-0-8-5-9"
                cx="41"
                cy="1041.3622"
@@ -4708,7 +4708,7 @@
            height="1.9999826"
            width="5"
            id="rect3977-39-2-3-77-4"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:#292d33;fill-opacity:1;stroke:none" />
         <rect
            transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
            ry="0"
@@ -4717,7 +4717,7 @@
            height="7.9999828"
            width="2"
            id="rect3979-7-0-6-4-7"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:#292d33;fill-opacity:1;stroke:none" />
       </g>
     </g>
     <g
@@ -4745,7 +4745,7 @@
                x="0"
                y="1029.3622" />
             <rect
-               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:#181a1e;fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="rect2987-02-7-6"
                width="50"
                height="20"
@@ -4754,7 +4754,7 @@
                ry="11"
                rx="11.000001" />
             <circle
-               style="fill:#cfd6e6;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:#9ba3ae;fill-opacity:1;fill-rule:nonzero;stroke:none;opacity:0.7"
                id="path3759-1-7-5-1"
                cx="41"
                cy="1041.3622"
@@ -4766,7 +4766,7 @@
          inkscape:connector-curvature="0"
          d="m 1043.0028,337 0.75,0 c 0.01,-9e-5 0.016,-3.5e-4 0.023,0 0.1912,0.008 0.3824,0.0964 0.5156,0.23437 l 1.711,1.71094 1.7343,-1.71094 c 0.1993,-0.17287 0.335,-0.22912 0.5157,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.026,0.41298 -0.1875,0.5625 l -1.711,1.71093 1.6875,1.6875 c 0.1412,0.14113 0.211,0.34009 0.211,0.53907 l 0,0.75 -0.75,0 c -0.199,-10e-6 -0.398,-0.0698 -0.5391,-0.21094 l -1.7109,-1.71094 -1.711,1.71094 c -0.1411,0.14114 -0.3401,0.21094 -0.539,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.07,-0.39794 0.2109,-0.53907 l 1.7109,-1.6875 -1.7109,-1.71093 c -0.1581,-0.14598 -0.2274,-0.35194 -0.2109,-0.5625 l 0,-0.75 z"
          id="path10839-9-8-2-2-5-5-9-7"
-         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#5c616c;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ba3ae;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
     <g
        style="display:inline"
@@ -4776,7 +4776,7 @@
       <ellipse
          cy="-177.63782"
          cx="595"
-         style="display:inline;opacity:0.9;fill:#22262b;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path4068-7-5-9-6-7-2-47"
          rx="6"
          ry="6.0000005" />
@@ -4797,7 +4797,7 @@
            inkscape:connector-curvature="0"
            d="m 1373,254 0,2 6,0 0,-2 z"
            id="rect9057-4-3-8"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#525d76;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.7;fill:#9ba3ae;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
            sodipodi:nodetypes="ccccc" />
       </g>
       <rect
@@ -4808,7 +4808,7 @@
          id="rect17883-32-6"
          style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0" />
       <path
-         style="display:inline;opacity:1;fill:#1b1d21;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:#141619;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          d="m 595,-184.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
          id="path4068-7-5-9-6-7-2-5-3"
          inkscape:connector-curvature="0" />
@@ -4834,7 +4834,7 @@
                r="7"
                cy="255"
                cx="1376"
-               style="fill:#f0464e;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               style="fill:#e45e65;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
                id="path4068-7-5-9-6-5" />
           </g>
         </g>
@@ -4904,12 +4904,12 @@
       <ellipse
          cy="-177.63782"
          cx="624"
-         style="display:inline;opacity:0.9;fill:#22262b;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path4068-7-5-9-6-7-2-6-0"
          rx="6"
          ry="6.0000005" />
       <path
-         style="display:inline;opacity:1;fill:#1b1d21;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:#141619;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          d="m 624,-184.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
          id="path4068-7-5-9-6-7-2-5-2-0"
          inkscape:connector-curvature="0" />
@@ -4928,7 +4928,7 @@
         </g>
         <path
            id="path4293-5-95-1"
-           style="display:inline;opacity:0.5;fill:#525d76;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="display:inline;opacity:0.7;fill:#9ba3ae;fill-opacity:1;fill-rule:evenodd;stroke:none"
            d="m 1403.7995,252 3.3818,0 c 0.4503,0 0.8162,0.36847 0.8187,0.8188 l 0,3.3817 z m 2.4074,6.00692 -3.395,0 c -0.4504,0 -0.8188,-0.36842 -0.8188,-0.81875 l 0,-3.39509 4.2138,4.21384"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="csscccsscc" />
@@ -4962,7 +4962,7 @@
                r="7"
                cy="255"
                cx="1376"
-               style="fill:#f36f75;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+               style="fill:#f48085;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
                id="path4068-7-5-8-2" />
           </g>
         </g>
@@ -5036,7 +5036,7 @@
         <ellipse
            cy="255"
            cx="1302"
-           style="display:inline;opacity:0.9;fill:#22262b;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path4068-7-5-9-6-7-2-4-6"
            rx="6"
            ry="6.0000005" />
@@ -5098,7 +5098,7 @@
                sodipodi:nodetypes="csscccsscc"
                inkscape:connector-curvature="0"
                d="m 87.799705,972 3.381737,0 c 0.450297,0 0.816227,0.36847 0.818758,0.8188 l 0,3.3817 z m 2.407413,6.00692 -3.395078,0 c -0.450346,0 -0.818758,-0.36842 -0.818758,-0.81875 l 0,-3.39509 4.213836,4.21384"
-               style="opacity:0.8;fill:#525d76;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               style="opacity:0.8;fill:#9ba3ae;fill-opacity:1;fill-rule:evenodd;stroke:none"
                id="path4293-6-7" />
           </g>
         </g>
@@ -5123,7 +5123,7 @@
         <ellipse
            cy="255"
            cx="1273"
-           style="display:inline;opacity:0.9;fill:#22262b;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path4068-7-5-9-6-7-2-1-6"
            rx="6"
            ry="6.0000005" />
@@ -5183,7 +5183,7 @@
              id="layer12-45-6-2">
             <path
                sodipodi:nodetypes="ccccc"
-               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.8;fill:#525d76;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+               style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.8;fill:#9ba3ae;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
                id="rect9057-8-2"
                d="m 86.0002,974 0,2 6,0 0,-2 z"
                inkscape:connector-curvature="0" />
@@ -5475,12 +5475,12 @@
         <ellipse
            cy="255"
            cx="1331"
-           style="display:inline;opacity:0.9;fill:#22262b;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            id="path4068-7-5-9-6-7-2-2-3"
            rx="6"
            ry="6.0000005" />
         <path
-           style="display:inline;opacity:1;fill:#1b1d21;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+           style="display:inline;opacity:1;fill:#141619;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
            d="m 1331,248 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
            id="path4068-7-5-9-6-7-2-5-8-1"
            inkscape:connector-curvature="0" />
@@ -5516,7 +5516,7 @@
                    inkscape:connector-curvature="0"
                    d="m 45,764 1,0 c 0.01037,-1.2e-4 0.02079,-4.6e-4 0.03125,0 0.254951,0.0112 0.50987,0.12858 0.6875,0.3125 L 49,766.59375 51.3125,764.3125 C 51.578125,764.082 51.759172,764.007 52,764 l 1,0 0,1 c 0,0.28647 -0.03434,0.55065 -0.25,0.75 l -2.28125,2.28125 2.25,2.25 C 52.906938,770.46942 52.999992,770.7347 53,771 l 0,1 -1,0 c -0.265301,-10e-6 -0.530586,-0.0931 -0.71875,-0.28125 L 49,769.4375 46.71875,771.71875 C 46.530586,771.90694 46.26529,772 46,772 l -1,0 0,-1 c -3e-6,-0.26529 0.09306,-0.53058 0.28125,-0.71875 l 2.28125,-2.25 L 45.28125,765.75 C 45.070508,765.55537 44.97809,765.28075 45,765 l 0,-1 z"
                    id="path10839-9-2-8"
-                   style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#525d76;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
+                   style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#9ba3ae;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
               </g>
             </g>
           </g>
@@ -5550,12 +5550,12 @@
       <ellipse
          cy="-160.63782"
          cx="624"
-         style="display:inline;opacity:0.9;fill:#22262b;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path4068-7-5-9-6-7-2-84-0"
          rx="6"
          ry="6.0000005" />
       <path
-         style="display:inline;opacity:1;fill:#1b1d21;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:#141619;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          d="m 624,-167.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
          id="path4068-7-5-9-6-7-2-5-7-6"
          inkscape:connector-curvature="0" />
@@ -5574,7 +5574,7 @@
         </g>
         <path
            id="path4293-5-6"
-           style="display:inline;opacity:0.5;fill:#525d76;fill-opacity:1;fill-rule:evenodd;stroke:none"
+           style="display:inline;opacity:0.6;fill:#9ba3ae;fill-opacity:1;fill-rule:evenodd;stroke:none"
            d="m 1403.7995,252 3.3818,0 c 0.4503,0 0.8162,0.36847 0.8187,0.8188 l 0,3.3817 z m 2.4074,6.00692 -3.395,0 c -0.4504,0 -0.8188,-0.36842 -0.8188,-0.81875 l 0,-3.39509 4.2138,4.21384"
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="csscccsscc" />
@@ -5595,12 +5595,12 @@
       <ellipse
          cy="-160.63782"
          cx="595"
-         style="display:inline;opacity:0.9;fill:#22262b;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:0.9;fill:#202328;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          id="path4068-7-5-9-6-7-2-60-3"
          rx="6"
          ry="6.0000005" />
       <path
-         style="display:inline;opacity:1;fill:#1b1d21;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+         style="display:inline;opacity:1;fill:#141619;fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
          d="m 595,-167.63782 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z m 0,1 a 6,6 0 0 1 6,6 6,6 0 0 1 -6,6 6,6 0 0 1 -6,-6 6,6 0 0 1 6,-6 z"
          id="path4068-7-5-9-6-7-2-5-4-4"
          inkscape:connector-curvature="0" />
@@ -5621,7 +5621,7 @@
            inkscape:connector-curvature="0"
            d="m 1373,254 0,2 6,0 0,-2 z"
            id="rect9057-4-09"
-           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:#525d76;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+           style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#9ba3ae;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
            sodipodi:nodetypes="ccccc" />
       </g>
       <rect