Merge branch 'testing'

1 files changed, 184 insertions, 184 deletions

diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index f92eb1c..7a4ae0c 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -109,13 +109,12 @@ GtkTextView {
   .grid-child:selected {
     outline-offset: -2px; }
 
-.popover.osd, .app-notification,
-.app-notification.frame, .osd {
-  color: #A8ADB5;
+.popover.osd, .osd {
+  color: #BAC3CF;
   border: none;
-  background-color: rgba(60, 64, 73, 0.95);
+  background-color: #2a2c33;
   background-clip: padding-box;
-  outline-color: rgba(168, 173, 181, 0.3);
+  outline-color: rgba(186, 195, 207, 0.3);
   box-shadow: none; }
 
 /**********************
@@ -245,18 +244,18 @@ GtkTextView {
       .linked.vertical > .entry:last-child:insensitive {
         border-bottom-color: rgba(0, 0, 0, 0.14); }
   .osd .entry {
-    color: #A8ADB5;
-    border-color: rgba(168, 173, 181, 0.3);
+    color: #BAC3CF;
+    border-color: rgba(0, 0, 0, 0.4);
     background-color: transparent;
-    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
     .osd .entry:focus {
-      color: #5294E2;
+      color: #BAC3CF;
       border-color: #5294E2;
-      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
     .osd .entry:insensitive {
-      color: #5c6169;
-      border-color: rgba(168, 173, 181, 0.2);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+      color: #555a62;
+      border-color: rgba(0, 0, 0, 0.4);
+      background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
 /***********
  * Buttons *
@@ -324,36 +323,34 @@ GtkTextView {
       .button:insensitive:active > GtkLabel, .button:insensitive:checked > GtkLabel {
         color: inherit; }
   .button.osd {
-    outline-color: rgba(168, 173, 181, 0.3);
-    color: #A8ADB5;
-    outline-color: rgba(168, 173, 181, 0.3);
-    border-color: rgba(168, 173, 181, 0.3);
-    background-color: transparent;
-    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95));
-    background-color: rgba(60, 64, 73, 0.95); }
+    outline-color: rgba(186, 195, 207, 0.3);
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
+    border-color: rgba(0, 0, 0, 0.45);
+    background-color: rgba(0, 0, 0, 0.3);
+    background-color: #2a2c33; }
     .button.osd.image-button {
       padding: 10px; }
     .button.osd:hover {
-      color: #5294E2;
-      outline-color: rgba(168, 173, 181, 0.3);
+      color: #BAC3CF;
+      outline-color: rgba(186, 195, 207, 0.3);
       border-color: #5294E2;
-      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95));
-      border-color: rgba(168, 173, 181, 0.3); }
+      background-color: rgba(0, 0, 0, 0.3);
+      background-color: #2a2c33; }
     .button.osd:active, .button.osd:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #5294E2;
-      background-image: linear-gradient(to bottom, #5294E2); }
+      background-color: #5294E2; }
     .button.osd:insensitive {
-      color: #5c6169;
-      border-color: rgba(168, 173, 181, 0.2);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+      color: #555a62;
+      border-color: rgba(0, 0, 0, 0.45);
+      background-color: rgba(0, 0, 0, 0.15); }
   .osd .button {
-    color: #A8ADB5;
-    outline-color: rgba(168, 173, 181, 0.3);
-    border-color: rgba(168, 173, 181, 0.3);
-    background-color: transparent;
-    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95));
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
+    border-color: rgba(0, 0, 0, 0.45);
+    background-color: rgba(0, 0, 0, 0.3);
     border-radius: 0;
     border-left-style: none;
     border-right-style: none; }
@@ -373,39 +370,39 @@ GtkTextView {
       border-radius: 3px;
       border-style: solid; }
     .osd .button:hover {
-      color: #5294E2;
-      outline-color: rgba(168, 173, 181, 0.3);
+      color: #BAC3CF;
+      outline-color: rgba(186, 195, 207, 0.3);
       border-color: #5294E2;
-      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+      background-color: rgba(0, 0, 0, 0.3); }
     .osd .button:active, .osd .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #5294E2;
-      background-image: linear-gradient(to bottom, #5294E2); }
+      background-color: #5294E2; }
     .osd .button:insensitive {
-      color: #5c6169;
-      border-color: rgba(168, 173, 181, 0.2);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+      color: #555a62;
+      border-color: rgba(0, 0, 0, 0.45);
+      background-color: rgba(0, 0, 0, 0.15); }
     .osd .button.flat {
       border-color: transparent;
       background-color: transparent;
       background-image: none;
       box-shadow: none; }
       .osd .button.flat:hover {
-        color: #5294E2;
-        outline-color: rgba(168, 173, 181, 0.3);
+        color: #BAC3CF;
+        outline-color: rgba(186, 195, 207, 0.3);
         border-color: #5294E2;
-        background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+        background-color: rgba(0, 0, 0, 0.3); }
       .osd .button.flat:insensitive {
-        color: #5c6169;
-        border-color: rgba(168, 173, 181, 0.2);
-        background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95));
+        color: #555a62;
+        border-color: rgba(0, 0, 0, 0.45);
+        background-color: rgba(0, 0, 0, 0.15);
         background-image: none; }
       .osd .button.flat:active, .osd .button.flat:checked {
         color: #ffffff;
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: #5294E2;
-        background-image: linear-gradient(to bottom, #5294E2); }
+        background-color: #5294E2; }
   .button.suggested-action {
     background-clip: border-box;
     color: #ffffff;
@@ -675,6 +672,8 @@ GtkTextView {
   border-radius: 2px; }
   .menuitem.button.flat:hover {
     background-color: #4b4f59; }
+  .menuitem.button.flat:checked {
+    color: #D3DAE3; }
 
 /*********
  * Links *
@@ -821,9 +820,9 @@ GtkComboBox {
   background-color: #444852; }
   .osd .toolbar, .osd .inline-toolbar, .toolbar.osd, .osd.inline-toolbar {
     padding: 7px;
-    border: none;
-    border-radius: 4px;
-    background-color: rgba(60, 64, 73, 0.95); }
+    border: 1px solid rgba(0, 0, 0, 0.6);
+    border-radius: 3px;
+    background-color: rgba(42, 44, 51, 0.9); }
 
 .primary-toolbar {
   color: rgba(207, 218, 231, 0.8);
@@ -1325,7 +1324,7 @@ column-header .button, column-header .button:hover, column-header .button:active
   border: 1px solid #2d3036; }
   .csd .menu, .csd .popup {
     padding: 4px 0px;
-    border-radius: 3px;
+    border-radius: 2px;
     border: none; }
   .menu .menuitem, .popup .menuitem {
     padding: 5px; }
@@ -1844,7 +1843,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
       background-image: linear-gradient(to bottom, #2679db);
       border-color: #2679db; }
     .osd .scale.slider {
-      background-image: linear-gradient(to bottom, rgba(60, 64, 73, 0.95));
+      background-image: linear-gradient(to bottom, #2a2c33);
       border-color: #5294E2; }
       .osd .scale.slider:hover {
         background-image: linear-gradient(to bottom, #5294E2); }
@@ -1874,8 +1873,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     .scale.trough:insensitive {
       background-image: linear-gradient(to bottom, rgba(47, 50, 58, 0.55)); }
     .osd .scale.trough {
-      background-image: linear-gradient(to bottom, rgba(76, 81, 93, 0.95));
-      outline-color: rgba(168, 173, 181, 0.2); }
+      background-image: linear-gradient(to bottom, #3a3e46);
+      outline-color: rgba(186, 195, 207, 0.2); }
       .osd .scale.trough.highlight {
         background-image: none;
         background-image: linear-gradient(to bottom, #5294E2); }
@@ -2020,40 +2019,40 @@ GtkScrolledWindow GtkViewport.frame {
 .app-notification,
 .app-notification.frame {
   padding: 10px;
-  background-color: rgba(60, 64, 73, 0.95);
+  color: #BAC3CF;
+  background-color: #3c4049;
   background-clip: border-box;
   border-radius: 0 0 2px 2px;
   border-width: 0 1px 1px 1px;
   border-style: solid;
-  border-color: rgba(37, 39, 45, 0.95); }
+  border-color: #25272d; }
   .app-notification .button,
   .app-notification.frame .button {
-    color: #A8ADB5;
-    outline-color: rgba(168, 173, 181, 0.3);
-    border-color: rgba(168, 173, 181, 0.3);
-    background-color: transparent;
-    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
+    border-color: rgba(0, 0, 0, 0.45);
+    background-color: rgba(0, 0, 0, 0.3); }
     .app-notification .button.flat,
     .app-notification.frame .button.flat {
       border-color: rgba(82, 148, 226, 0); }
     .app-notification .button:hover,
     .app-notification.frame .button:hover {
-      color: #5294E2;
-      outline-color: rgba(168, 173, 181, 0.3);
+      color: #BAC3CF;
+      outline-color: rgba(186, 195, 207, 0.3);
       border-color: #5294E2;
-      background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+      background-color: rgba(0, 0, 0, 0.3); }
     .app-notification .button:active,
     .app-notification .button:checked,
     .app-notification.frame .button:active, .app-notification.frame .button:checked {
       color: #ffffff;
       outline-color: rgba(255, 255, 255, 0.3);
       border-color: #5294E2;
-      background-image: linear-gradient(to bottom, #5294E2); }
+      background-color: #5294E2; }
     .app-notification .button:insensitive,
     .app-notification.frame .button:insensitive {
-      color: #5c6169;
-      border-color: rgba(168, 173, 181, 0.2);
-      background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+      color: #555a62;
+      border-color: rgba(0, 0, 0, 0.45);
+      background-color: rgba(0, 0, 0, 0.15); }
 
 /*************
  * Expanders *
@@ -2224,10 +2223,10 @@ GtkInfoBar {
  * Tooltips *
  ************/
 .tooltip {
-  color: #edf5fb;
+  color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: rgba(60, 64, 73, 0.95);
+    background-color: #2a2c33;
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
@@ -2343,7 +2342,7 @@ GtkVolumeButton.button {
     .window-frame.ssd.maximized {
       border-radius: 0; }
   .window-frame.csd.popup, .window-frame.csd.menu {
-    border-radius: 3px;
+    border-radius: 2px;
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #212429; }
   .window-frame.csd.tooltip {
     border-radius: 2px;
@@ -2436,7 +2435,7 @@ GtkVolumeButton.button {
 .view:selected:focus,
 .view:selected:hover, .label:selected,
 .label:selected:focus,
-.label:selected:hover, .grid-child:selected, .menuitem.button.flat:selected, .menuitem.button.flat:checked, .menuitem.button.flat:active, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
+.label:selected:hover, .grid-child:selected, .menuitem.button.flat:active, .menuitem.button.flat:selected, .list-row:selected, GtkEntry.gb-command-bar-entry.entry.flat:selected,
 GtkEntry.gb-command-bar-entry.entry.flat:selected:focus {
   background-image: none;
   background-color: #5294E2;
@@ -2816,16 +2815,16 @@ GbPreferencesPageLanguage GtkScrolledWindow {
 
 GtkBox.gb-command-bar-box {
   border: none;
-  background-color: #3c4049; }
+  background-color: #2a2c33; }
   GtkBox.gb-command-bar-box GtkLabel {
-    color: #A8ADB5; }
+    color: #BAC3CF; }
 
 GtkEntry.gb-command-bar-entry.entry.flat,
 GtkEntry.gb-command-bar-entry.entry.flat:focus {
   font-family: Monospace;
-  color: #A8ADB5;
+  color: #BAC3CF;
   background-image: none;
-  background-color: #3c4049;
+  background-color: #2a2c33;
   padding: 6px 6px 6px 6px;
   border: none; }
 
@@ -2903,8 +2902,8 @@ PanelToplevel,
 PanelWidget,
 PanelAppletFrame,
 PanelApplet {
-  color: #A8ADB5;
-  background-image: linear-gradient(to bottom, rgba(37, 39, 45, 0.95)); }
+  color: #BAC3CF;
+  background-image: linear-gradient(to bottom, #1f2125); }
 
 PanelApplet .button, PanelApplet .button:backdrop {
   padding: 4px;
@@ -2912,10 +2911,10 @@ PanelApplet .button, PanelApplet .button:backdrop {
   border-radius: 0;
   background-image: none;
   background-color: transparent;
-  color: #A8ADB5; }
+  color: #BAC3CF; }
 
 PanelApplet .button:hover {
-  color: #c4c7cc;
+  color: #d8dde4;
   background-color: rgba(0, 0, 0, 0.17);
   border-color: rgba(0, 0, 0, 0.17); }
 
@@ -2936,7 +2935,7 @@ PanelApplet:hover:active {
   color: #5294E2; }
 
 WnckPager {
-  color: #54575b; }
+  color: #5d6268; }
   WnckPager:selected {
     color: #5294E2; }
 
@@ -2945,21 +2944,21 @@ NaTrayApplet {
   -NaTrayApplet-icon-size: 16; }
 
 ClockBox {
-  color: #A8ADB5; }
+  color: #BAC3CF; }
 
 .xfce4-panel.panel {
-  background-color: rgba(37, 39, 45, 0.95); }
+  background-color: #1f2125; }
   .xfce4-panel.panel .button.flat {
-    color: #A8ADB5;
-    background-color: rgba(37, 39, 45, 0);
+    color: #BAC3CF;
+    background-color: rgba(31, 33, 37, 0);
     border-radius: 0; }
     .xfce4-panel.panel .button.flat:hover {
       border: none;
-      background-color: rgba(60, 64, 73, 0.95); }
+      background-color: #363941; }
     .xfce4-panel.panel .button.flat:active, .xfce4-panel.panel .button.flat:checked {
       color: #5294E2;
       border: none;
-      background-color: rgba(21, 22, 25, 0.95); }
+      background-color: #0f1012; }
 
 .floating-bar {
   background-color: #5294E2;
@@ -3144,8 +3143,8 @@ UnityDecoration {
 
 UnityPanelWidget,
 .unity-panel {
-  background-image: linear-gradient(to bottom, #25272d);
-  color: #dfe1e4;
+  background-image: linear-gradient(to bottom, #1f2125);
+  color: #f6f7f9;
   box-shadow: none; }
 
 .unity-panel.menubar.menuitem:hover,
@@ -3311,18 +3310,18 @@ GtkListBox .h4 {
 
 /* the panel widget at the top */
 #panel_window {
-  background-color: rgba(37, 39, 45, 0.95);
-  color: #A8ADB5;
+  background-color: #1f2125;
+  color: #BAC3CF;
   font: bold;
-  box-shadow: inset 0 -1px rgba(21, 22, 25, 0.95);
+  box-shadow: inset 0 -1px #0f1012;
   /* the menubars/menus of the panel, i.e. indicators */ }
   #panel_window .menubar,
   #panel_window .menubar > .menuitem {
     background-color: transparent;
-    color: #A8ADB5;
+    color: #BAC3CF;
     font: bold; }
   #panel_window .menubar .menuitem:insensitive {
-    color: #727985; }
+    color: rgba(186, 195, 207, 0.5); }
     #panel_window .menubar .menuitem:insensitive GtkLabel {
       color: inherit; }
   #panel_window .menubar .menu .menuitem {
@@ -3340,9 +3339,11 @@ GtkListBox .h4 {
 /* the top half of the login-window, in GtkDialog terms, the content */
 #content_frame {
   padding-bottom: 14px;
-  background-color: rgba(68, 72, 82, 0.95);
+  background-color: #383C45;
   border-top-left-radius: 2px;
-  border-top-right-radius: 2px; }
+  border-top-right-radius: 2px;
+  border: solid rgba(0, 0, 0, 0.1);
+  border-width: 1px 1px 0 1px; }
 
 #content_frame .button {
   color: #D3DAE3;
@@ -3371,30 +3372,32 @@ GtkListBox .h4 {
   padding-top: 20px;
   padding-bottom: 0px;
   border-style: none;
-  background-color: rgba(60, 64, 73, 0.95);
-  border-bottom-left-radius: 2px;
-  border-bottom-right-radius: 2px; }
+  background-color: #2a2c33;
+  border-bottom-left-radius: 3px;
+  border-bottom-right-radius: 3px;
+  border: solid rgba(0, 0, 0, 0.1);
+  border-width: 0 1px 1px 1px;
+  box-shadow: inset 0 1px #131417; }
 
 #buttonbox_frame .button {
-  color: #A8ADB5;
-  outline-color: rgba(168, 173, 181, 0.3);
-  border-color: rgba(168, 173, 181, 0.3);
-  background-color: transparent;
-  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  color: #BAC3CF;
+  outline-color: rgba(186, 195, 207, 0.3);
+  border-color: rgba(0, 0, 0, 0.45);
+  background-color: rgba(0, 0, 0, 0.3); }
   #buttonbox_frame .button:hover {
-    color: #5294E2;
-    outline-color: rgba(168, 173, 181, 0.3);
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    background-color: rgba(0, 0, 0, 0.3); }
   #buttonbox_frame .button:active, #buttonbox_frame .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2); }
+    background-color: #5294E2; }
   #buttonbox_frame .button:insensitive {
-    color: #5c6169;
-    border-color: rgba(168, 173, 181, 0.2);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+    color: #555a62;
+    border-color: rgba(0, 0, 0, 0.45);
+    background-color: rgba(0, 0, 0, 0.15); }
 
 #login_window #user_combobox {
   color: #D3DAE3;
@@ -3405,50 +3408,48 @@ GtkListBox .h4 {
 /* the user's avatar box */
 #user_image {
   padding: 3px;
-  border-radius: 3px; }
+  border-radius: 2px; }
 
 /* the border around the user's avatar box */
 /* the shutdown button */
 #shutdown_button.button {
+  background-clip: border-box;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3);
-  border-color: #F04A50;
   background-color: #F04A50;
-  background-image: none;
-  background-clip: border-box; }
+  border-color: #F04A50; }
   #shutdown_button.button:hover {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #f47479;
-    background-color: #f47479;
-    background-image: none; }
+    background-color: #f4797e;
+    border-color: #f4797e; }
   #shutdown_button.button:active, #shutdown_button.button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #ed2930;
-    background-color: #ed2930;
-    background-image: none; }
+    background-color: #ec1b22;
+    border-color: #ec1b22; }
 
 /* the restart button */
 #restart_button.button {
+  background-clip: border-box;
   color: #ffffff;
   outline-color: rgba(255, 255, 255, 0.3);
-  border-color: #51CF74;
-  background-color: #51CF74;
-  background-image: none;
-  background-clip: border-box; }
+  background-color: #4DADD4;
+  border-color: #4DADD4; }
   #restart_button.button:hover {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #75d991;
-    background-color: #75d991;
-    background-image: none; }
+    background-color: #76c0de;
+    border-color: #76c0de; }
   #restart_button.button:active, #restart_button.button:checked {
+    background-clip: border-box;
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
-    border-color: #37c65e;
-    background-color: #37c65e;
-    background-image: none; }
+    background-color: #2e96c0;
+    border-color: #2e96c0; }
 
 /* the warning, in case a wrong password is entered or something else goes wrong according to PAM */
 #greeter_infobar {
@@ -3469,12 +3470,12 @@ NemoWindow {
 GtkFileChooserDialog .sidebar,
 NautilusWindow .sidebar,
 NemoWindow .sidebar {
-  border-right: 1px solid #2e3138; }
+  border-right: 1px solid #25272d; }
 
 GtkFileChooserDialog .sidebar:dir(rtl),
 NautilusWindow .sidebar:dir(rtl),
 NemoWindow .sidebar:dir(rtl) {
-  border-left: 1px solid #2e3138; }
+  border-left: 1px solid #25272d; }
 
 GtkFileChooserDialog.csd.background,
 GtkFileChooserDialog .source-list,
@@ -3499,7 +3500,7 @@ NautilusWindow .source-list.sidebar.view,
 NemoWindow .sidebar,
 NemoWindow .source-list.sidebar.view,
 MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
-  background-color: #454a54; }
+  background-color: #3c4049; }
   GtkFileChooserDialog .sidebar .view,
   GtkFileChooserDialog .sidebar row,
   GtkFileChooserDialog .source-list.sidebar.view .view,
@@ -3514,7 +3515,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
   NemoWindow .source-list.sidebar.view row,
   MarlinViewWindow .sidebar .view, MarlinViewWindow .sidebar row, MarlinViewWindow .source-list.sidebar.view .view, MarlinViewWindow .source-list.sidebar.view row {
     background-color: transparent;
-    color: #A8ADB5; }
+    color: #BAC3CF; }
     GtkFileChooserDialog .sidebar .view.image,
     GtkFileChooserDialog .sidebar row.image,
     GtkFileChooserDialog .source-list.sidebar.view .view.image,
@@ -3528,7 +3529,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
     NemoWindow .source-list.sidebar.view .view.image,
     NemoWindow .source-list.sidebar.view row.image,
     MarlinViewWindow .sidebar .view.image, MarlinViewWindow .sidebar row.image, MarlinViewWindow .source-list.sidebar.view .view.image, MarlinViewWindow .source-list.sidebar.view row.image {
-      color: rgba(168, 173, 181, 0.6); }
+      color: rgba(186, 195, 207, 0.7); }
     GtkFileChooserDialog .sidebar .view.cell:selected,
     GtkFileChooserDialog .sidebar row.cell:selected,
     GtkFileChooserDialog .source-list.sidebar.view .view.cell:selected,
@@ -3551,7 +3552,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
   NemoWindow .sidebar.frame,
   NemoWindow .source-list.sidebar.view.frame,
   MarlinViewWindow .sidebar.frame, MarlinViewWindow .source-list.sidebar.view.frame {
-    color: #A8ADB5; }
+    color: #BAC3CF; }
   GtkFileChooserDialog .sidebar .separator,
   GtkFileChooserDialog GtkPlacesSidebar.sidebar .view.separator,
   GtkFileChooserDialog .source-list.sidebar.view .separator,
@@ -3570,7 +3571,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
   NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
   NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
   MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #d1d4d8;
+    background-color: #e7eaee;
     border: 1px solid rgba(0, 0, 0, 0.3); }
   GtkFileChooserDialog .sidebar .scrollbar .trough,
   GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
@@ -3588,7 +3589,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
   NemoWindow .sidebar .scrollbar .slider,
   NemoWindow .source-list.sidebar.view .scrollbar .slider,
   MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider {
-    background-color: rgba(209, 212, 216, 0.7); }
+    background-color: rgba(231, 234, 238, 0.7); }
     GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
     GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover,
     NautilusWindow .sidebar .scrollbar .slider:hover,
@@ -3596,7 +3597,7 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
     NemoWindow .sidebar .scrollbar .slider:hover,
     NemoWindow .source-list.sidebar.view .scrollbar .slider:hover,
     MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover {
-      background-color: #dfe1e4; }
+      background-color: #f6f7f9; }
     GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
     GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active,
     NautilusWindow .sidebar .scrollbar .slider:prelight:active,
@@ -3618,16 +3619,16 @@ GtkFileChooserDialog.maximized .sidebar,
 NautilusWindow.maximized .sidebar,
 NemoWindow.maximized .sidebar,
 MarlinViewWindow.maximized .sidebar {
-  background-color: #454a54; }
+  background-color: #3c4049; }
 
 GtkFileChooserDialog .pane-separator,
 NautilusWindow .pane-separator,
 NemoWindow .pane-separator,
 MarlinViewWindow .pane-separator {
-  background-color: #2e3138; }
+  background-color: #25272d; }
 
 GtkFileChooserDialog.background.csd, GtkFileChooserDialog.background {
-  background-color: #454a54; }
+  background-color: #3c4049; }
 
 GtkFileChooserDialog .sidebar {
   background-color: transparent; }
@@ -3639,23 +3640,23 @@ GtkFileChooserDialog .dialog-action-box {
   background-color: #444852; }
 
 GtkFileChooserDialog .dialog-vbox > .frame {
-  color: #A8ADB5;
+  color: #BAC3CF;
   border-color: transparent; }
 
 GtkFileChooserDialog .action-bar.frame {
   background-color: transparent;
-  border-color: #23252a; }
+  border-color: #191b1f; }
 
 GtkFileChooserDialog .action-bar.frame GtkLabel,
 GtkFileChooserDialog .action-bar.frame GtkComboBox,
 GtkFileChooserDialog .dialog-vbox > .frame GtkLabel, GtkFileChooserDialog .dialog-vbox > .frame GtkComboBox {
-  color: #A8ADB5; }
+  color: #BAC3CF; }
 
 GeditWindow.background.csd {
   background-color: transparent; }
   GeditWindow.background.csd .pane-separator,
   GeditWindow.background.csd .pane-separator:hover {
-    background-color: #2e3138; }
+    background-color: #25272d; }
   GeditWindow.background.csd .titlebar .pane-separator,
   GeditWindow.background.csd.maximized .titlebar .pane-separator,
   GeditWindow.background.csd .titlebar .pane-separator:backdrop,
@@ -3666,19 +3667,19 @@ GeditWindow.background.csd {
   background-color: #383C45; }
 
 .gedit-document-panel {
-  background-color: #454a54; }
+  background-color: #3c4049; }
   .maximized .gedit-document-panel {
-    background-color: #454a54; }
+    background-color: #3c4049; }
   .gedit-document-panel .list-row {
-    color: #A8ADB5; }
+    color: #BAC3CF; }
   .gedit-document-panel .list-row {
-    background-color: rgba(168, 173, 181, 0);
-    border: solid rgba(168, 173, 181, 0);
+    background-color: rgba(186, 195, 207, 0);
+    border: solid rgba(186, 195, 207, 0);
     border-width: 3px 2px 3px 2px; }
   .gedit-document-panel .list-row:hover {
-    border: solid rgba(168, 173, 181, 0.15);
+    border: solid rgba(186, 195, 207, 0.15);
     border-width: 3px 2px 3px 2px;
-    background-color: rgba(168, 173, 181, 0.15); }
+    background-color: rgba(186, 195, 207, 0.15); }
   .gedit-document-panel .list-row:active {
     color: #ffffff;
     background-color: #5294E2;
@@ -3692,82 +3693,81 @@ GeditWindow.background.csd {
     border: solid #5294E2;
     border-width: 3px 2px 3px 2px; }
   .gedit-document-panel .prelight-row .button:active {
-    color: #A8ADB5; }
+    color: #BAC3CF; }
 
 GeditWindow.background.csd GeditFileBrowserWidget {
-  background-color: #454a54; }
+  background-color: #3c4049; }
   .maximized GeditWindow.background.csd GeditFileBrowserWidget {
-    background-color: #454a54; }
+    background-color: #3c4049; }
   GeditWindow.background.csd GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #d1d4d8;
+    background-color: #e7eaee;
     border: 1px solid rgba(0, 0, 0, 0.3); }
   GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .trough {
     background-color: rgba(0, 0, 0, 0.2);
     border: none; }
   GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider {
-    background-color: rgba(209, 212, 216, 0.7); }
+    background-color: rgba(231, 234, 238, 0.7); }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #d1d4d8; }
+      background-color: #e7eaee; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:prelight:active {
       background-color: #5294E2; }
     GeditWindow.background.csd GeditFileBrowserWidget .scrollbar .slider:insensitive {
       background-color: transparent; }
   GeditWindow.background.csd GeditFileBrowserWidget .horizontal {
     background-color: transparent;
-    border-color: #353941; }
+    border-color: #2c2f35; }
     GeditWindow.background.csd GeditFileBrowserWidget .horizontal GtkComboBox {
-      color: #A8ADB5; }
+      color: #BAC3CF; }
 
 GeditWindow.background.csd GeditFileBrowserView.view {
   background-color: transparent;
-  color: #A8ADB5; }
+  color: #BAC3CF; }
   GeditWindow.background.csd GeditFileBrowserView.view.expander {
-    color: #A8ADB5; }
+    color: #BAC3CF; }
     GeditWindow.background.csd GeditFileBrowserView.view.expander:hover {
       color: #5294E2; }
 
 GtkFileChooserDialog .action-bar.frame .button,
 GtkFileChooserDialog .dialog-vbox > .frame .button, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button {
-  color: #A8ADB5;
-  outline-color: rgba(168, 173, 181, 0.3);
-  border-color: rgba(168, 173, 181, 0.3);
-  background-color: transparent;
-  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  color: #BAC3CF;
+  outline-color: rgba(186, 195, 207, 0.3);
+  border-color: rgba(0, 0, 0, 0.45);
+  background-color: rgba(0, 0, 0, 0.3); }
   GtkFileChooserDialog .action-bar.frame .button:hover,
   GtkFileChooserDialog .dialog-vbox > .frame .button:hover, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:hover {
-    color: #5294E2;
-    outline-color: rgba(168, 173, 181, 0.3);
+    color: #BAC3CF;
+    outline-color: rgba(186, 195, 207, 0.3);
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    background-color: rgba(0, 0, 0, 0.3); }
   GtkFileChooserDialog .action-bar.frame .button:active,
   GtkFileChooserDialog .dialog-vbox > .frame .button:active, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:active, GtkFileChooserDialog .action-bar.frame .button:checked,
   GtkFileChooserDialog .dialog-vbox > .frame .button:checked, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:checked {
     color: #ffffff;
     outline-color: rgba(255, 255, 255, 0.3);
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, #5294E2); }
+    background-color: #5294E2; }
   GtkFileChooserDialog .action-bar.frame .button:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .button:insensitive, GeditWindow.background.csd GeditFileBrowserWidget .horizontal .button:insensitive {
-    color: #5c6169;
-    border-color: rgba(168, 173, 181, 0.2);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+    color: #555a62;
+    border-color: rgba(0, 0, 0, 0.45);
+    background-color: rgba(0, 0, 0, 0.15); }
 
 GtkFileChooserDialog .action-bar.frame .entry,
 GtkFileChooserDialog .dialog-vbox > .frame .entry {
-  color: #A8ADB5;
-  border-color: rgba(168, 173, 181, 0.3);
+  color: #BAC3CF;
+  border-color: rgba(0, 0, 0, 0.4);
   background-color: transparent;
-  background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
   GtkFileChooserDialog .action-bar.frame .entry:focus,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:focus {
-    color: #5294E2;
+    color: #BAC3CF;
     border-color: #5294E2;
-    background-image: linear-gradient(to bottom, rgba(48, 52, 59, 0.95)); }
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
   GtkFileChooserDialog .action-bar.frame .entry:insensitive,
   GtkFileChooserDialog .dialog-vbox > .frame .entry:insensitive {
-    color: #5c6169;
-    border-color: rgba(168, 173, 181, 0.2);
-    background-image: linear-gradient(to bottom, rgba(53, 57, 65, 0.95)); }
+    color: #555a62;
+    border-color: rgba(0, 0, 0, 0.4);
+    background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
 
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #D3DAE3;