merge 3.16

7 files changed, 282 insertions, 319 deletions

diff --git a/common/gtk-3.0/3.18/gtk-contained-dark.css b/common/gtk-3.0/3.18/gtk-contained-dark.css
index 666a016..25a7051 100644
--- a/common/gtk-3.0/3.18/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-dark.css
@@ -191,6 +191,17 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
+  .linked > .entry:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+    .linked > .entry:first-child:dir(rtl) {
+      border-right-style: none; }
+  .linked > .entry:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+    .linked > .entry:last-child:dir(rtl) {
+      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -217,52 +228,38 @@ GtkTextView {
       color: #D3DAE3; }
     .entry.image:active {
       color: #5294E2; }
-
-.linked > .entry:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0; }
-  .linked > .entry:first-child:dir(rtl) {
-    border-right-style: none; }
-
-.linked > .entry:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  border-left-style: none; }
-  .linked > .entry:last-child:dir(rtl) {
-    border-left-style: solid; }
-
-.linked.vertical > .entry {
-  border-bottom-color: #353841;
-  box-shadow: none; }
-  .linked.vertical > .entry:focus {
-    border-color: #5294E2;
-    box-shadow: 0 -1px 0 0 #5294E2; }
-  .linked.vertical > .entry:insensitive {
-    border-bottom-color: #353841; }
-  .linked.vertical > .entry:first-child {
-    border-bottom-color: #353841; }
-    .linked.vertical > .entry:first-child:focus {
-      border-bottom-color: #5294E2;
-      box-shadow: none; }
-    .linked.vertical > .entry:first-child:insensitive {
-      border-bottom-color: #353841; }
-  .linked.vertical > .entry:last-child {
-    border-bottom-color: rgba(0, 0, 0, 0.14); }
-    .linked.vertical > .entry:last-child:focus {
-      border-bottom-color: #5294E2;
+  .linked.vertical > .entry {
+    border-bottom-color: #353841;
+    box-shadow: none; }
+    .linked.vertical > .entry:focus {
+      border-color: #5294E2;
       box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:last-child:insensitive {
+    .linked.vertical > .entry:insensitive {
+      border-bottom-color: #353841; }
+    .linked.vertical > .entry:first-child {
+      border-bottom-color: #353841; }
+      .linked.vertical > .entry:first-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: none; }
+      .linked.vertical > .entry:first-child:insensitive {
+        border-bottom-color: #353841; }
+    .linked.vertical > .entry:last-child {
       border-bottom-color: rgba(0, 0, 0, 0.14); }
-  .osd .linked.vertical > .entry {
+      .linked.vertical > .entry:last-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: 0 -1px 0 0 #5294E2; }
+      .linked.vertical > .entry:last-child:insensitive {
+        border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
     color: #BAC3CF;
     border-color: rgba(0, 0, 0, 0.4);
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:focus {
+    .osd .entry:focus {
       color: #BAC3CF;
       border-color: #5294E2;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:insensitive {
+    .osd .entry:insensitive {
       color: #555a62;
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@@ -526,10 +523,9 @@ GtkTextView {
     .stack-switcher > .button.needs-attention > .label:dir(rtl),
     .stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
       background-position: left 3px, left 2px; }
-
-.inline-toolbar .button, .inline-toolbar .button:backdrop {
-  border-radius: 2px;
-  border-width: 1px; }
+  .inline-toolbar .button, .inline-toolbar .button:backdrop {
+    border-radius: 2px;
+    border-width: 1px; }
 
 .inline-toolbar GtkToolButton > .button {
   color: #D3DAE3;
@@ -801,7 +797,6 @@ GtkTextView {
 /* menu buttons */
 .menuitem.button.flat, .menuitem.sidebar-button.button {
   transition: none;
-  color: #D3DAE3;
   outline-offset: -1px;
   border-radius: 2px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {
diff --git a/common/gtk-3.0/3.18/gtk-contained-darker.css b/common/gtk-3.0/3.18/gtk-contained-darker.css
index 0c2fb24..0c37ccb 100644
--- a/common/gtk-3.0/3.18/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-darker.css
@@ -191,6 +191,17 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
+  .linked > .entry:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+    .linked > .entry:first-child:dir(rtl) {
+      border-right-style: none; }
+  .linked > .entry:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+    .linked > .entry:last-child:dir(rtl) {
+      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -217,52 +228,38 @@ GtkTextView {
       color: #5c616c; }
     .entry.image:active {
       color: #5294E2; }
-
-.linked > .entry:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0; }
-  .linked > .entry:first-child:dir(rtl) {
-    border-right-style: none; }
-
-.linked > .entry:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  border-left-style: none; }
-  .linked > .entry:last-child:dir(rtl) {
-    border-left-style: solid; }
-
-.linked.vertical > .entry {
-  border-bottom-color: #f4f5f6;
-  box-shadow: none; }
-  .linked.vertical > .entry:focus {
-    border-color: #5294E2;
-    box-shadow: 0 -1px 0 0 #5294E2; }
-  .linked.vertical > .entry:insensitive {
-    border-bottom-color: #f4f5f6; }
-  .linked.vertical > .entry:first-child {
-    border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:first-child:focus {
-      border-bottom-color: #5294E2;
-      box-shadow: none; }
-    .linked.vertical > .entry:first-child:insensitive {
-      border-bottom-color: #f4f5f6; }
-  .linked.vertical > .entry:last-child {
-    border-bottom-color: rgba(0, 0, 0, 0.14); }
-    .linked.vertical > .entry:last-child:focus {
-      border-bottom-color: #5294E2;
+  .linked.vertical > .entry {
+    border-bottom-color: #f4f5f6;
+    box-shadow: none; }
+    .linked.vertical > .entry:focus {
+      border-color: #5294E2;
       box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:last-child:insensitive {
+    .linked.vertical > .entry:insensitive {
+      border-bottom-color: #f4f5f6; }
+    .linked.vertical > .entry:first-child {
+      border-bottom-color: #f4f5f6; }
+      .linked.vertical > .entry:first-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: none; }
+      .linked.vertical > .entry:first-child:insensitive {
+        border-bottom-color: #f4f5f6; }
+    .linked.vertical > .entry:last-child {
       border-bottom-color: rgba(0, 0, 0, 0.14); }
-  .osd .linked.vertical > .entry {
+      .linked.vertical > .entry:last-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: 0 -1px 0 0 #5294E2; }
+      .linked.vertical > .entry:last-child:insensitive {
+        border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
     color: #BAC3CF;
     border-color: rgba(0, 0, 0, 0.4);
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:focus {
+    .osd .entry:focus {
       color: #BAC3CF;
       border-color: #5294E2;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:insensitive {
+    .osd .entry:insensitive {
       color: #555a62;
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@@ -526,10 +523,9 @@ GtkTextView {
     .stack-switcher > .button.needs-attention > .label:dir(rtl),
     .stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
       background-position: left 3px, left 4px; }
-
-.inline-toolbar .button, .inline-toolbar .button:backdrop {
-  border-radius: 2px;
-  border-width: 1px; }
+  .inline-toolbar .button, .inline-toolbar .button:backdrop {
+    border-radius: 2px;
+    border-width: 1px; }
 
 .inline-toolbar GtkToolButton > .button {
   color: #5c616c;
@@ -801,7 +797,6 @@ GtkTextView {
 /* menu buttons */
 .menuitem.button.flat, .menuitem.sidebar-button.button {
   transition: none;
-  color: #5c616c;
   outline-offset: -1px;
   border-radius: 2px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
index a4cc211..a3a4791 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-dark.css
@@ -191,6 +191,17 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
+  .linked > .entry:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+    .linked > .entry:first-child:dir(rtl) {
+      border-right-style: none; }
+  .linked > .entry:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+    .linked > .entry:last-child:dir(rtl) {
+      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -217,52 +228,38 @@ GtkTextView {
       color: #D3DAE3; }
     .entry.image:active {
       color: #5294E2; }
-
-.linked > .entry:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0; }
-  .linked > .entry:first-child:dir(rtl) {
-    border-right-style: none; }
-
-.linked > .entry:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  border-left-style: none; }
-  .linked > .entry:last-child:dir(rtl) {
-    border-left-style: solid; }
-
-.linked.vertical > .entry {
-  border-bottom-color: #353841;
-  box-shadow: none; }
-  .linked.vertical > .entry:focus {
-    border-color: #5294E2;
-    box-shadow: 0 -1px 0 0 #5294E2; }
-  .linked.vertical > .entry:insensitive {
-    border-bottom-color: #353841; }
-  .linked.vertical > .entry:first-child {
-    border-bottom-color: #353841; }
-    .linked.vertical > .entry:first-child:focus {
-      border-bottom-color: #5294E2;
-      box-shadow: none; }
-    .linked.vertical > .entry:first-child:insensitive {
-      border-bottom-color: #353841; }
-  .linked.vertical > .entry:last-child {
-    border-bottom-color: rgba(0, 0, 0, 0.14); }
-    .linked.vertical > .entry:last-child:focus {
-      border-bottom-color: #5294E2;
+  .linked.vertical > .entry {
+    border-bottom-color: #353841;
+    box-shadow: none; }
+    .linked.vertical > .entry:focus {
+      border-color: #5294E2;
       box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:last-child:insensitive {
+    .linked.vertical > .entry:insensitive {
+      border-bottom-color: #353841; }
+    .linked.vertical > .entry:first-child {
+      border-bottom-color: #353841; }
+      .linked.vertical > .entry:first-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: none; }
+      .linked.vertical > .entry:first-child:insensitive {
+        border-bottom-color: #353841; }
+    .linked.vertical > .entry:last-child {
       border-bottom-color: rgba(0, 0, 0, 0.14); }
-  .osd .linked.vertical > .entry {
+      .linked.vertical > .entry:last-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: 0 -1px 0 0 #5294E2; }
+      .linked.vertical > .entry:last-child:insensitive {
+        border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
     color: #BAC3CF;
     border-color: rgba(0, 0, 0, 0.4);
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:focus {
+    .osd .entry:focus {
       color: #BAC3CF;
       border-color: #5294E2;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:insensitive {
+    .osd .entry:insensitive {
       color: #555a62;
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@@ -526,10 +523,9 @@ GtkTextView {
     .stack-switcher > .button.needs-attention > .label:dir(rtl),
     .stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
       background-position: left 3px, left 2px; }
-
-.inline-toolbar .button, .inline-toolbar .button:backdrop {
-  border-radius: 2px;
-  border-width: 1px; }
+  .inline-toolbar .button, .inline-toolbar .button:backdrop {
+    border-radius: 2px;
+    border-width: 1px; }
 
 .inline-toolbar GtkToolButton > .button {
   color: #D3DAE3;
@@ -801,7 +797,6 @@ GtkTextView {
 /* menu buttons */
 .menuitem.button.flat, .menuitem.sidebar-button.button {
   transition: none;
-  color: #D3DAE3;
   outline-offset: -1px;
   border-radius: 2px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
index 31224bf..43e7b64 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid-darker.css
@@ -191,6 +191,17 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
+  .linked > .entry:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+    .linked > .entry:first-child:dir(rtl) {
+      border-right-style: none; }
+  .linked > .entry:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+    .linked > .entry:last-child:dir(rtl) {
+      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -217,52 +228,38 @@ GtkTextView {
       color: #5c616c; }
     .entry.image:active {
       color: #5294E2; }
-
-.linked > .entry:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0; }
-  .linked > .entry:first-child:dir(rtl) {
-    border-right-style: none; }
-
-.linked > .entry:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  border-left-style: none; }
-  .linked > .entry:last-child:dir(rtl) {
-    border-left-style: solid; }
-
-.linked.vertical > .entry {
-  border-bottom-color: #f4f5f6;
-  box-shadow: none; }
-  .linked.vertical > .entry:focus {
-    border-color: #5294E2;
-    box-shadow: 0 -1px 0 0 #5294E2; }
-  .linked.vertical > .entry:insensitive {
-    border-bottom-color: #f4f5f6; }
-  .linked.vertical > .entry:first-child {
-    border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:first-child:focus {
-      border-bottom-color: #5294E2;
-      box-shadow: none; }
-    .linked.vertical > .entry:first-child:insensitive {
-      border-bottom-color: #f4f5f6; }
-  .linked.vertical > .entry:last-child {
-    border-bottom-color: rgba(0, 0, 0, 0.14); }
-    .linked.vertical > .entry:last-child:focus {
-      border-bottom-color: #5294E2;
+  .linked.vertical > .entry {
+    border-bottom-color: #f4f5f6;
+    box-shadow: none; }
+    .linked.vertical > .entry:focus {
+      border-color: #5294E2;
       box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:last-child:insensitive {
+    .linked.vertical > .entry:insensitive {
+      border-bottom-color: #f4f5f6; }
+    .linked.vertical > .entry:first-child {
+      border-bottom-color: #f4f5f6; }
+      .linked.vertical > .entry:first-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: none; }
+      .linked.vertical > .entry:first-child:insensitive {
+        border-bottom-color: #f4f5f6; }
+    .linked.vertical > .entry:last-child {
       border-bottom-color: rgba(0, 0, 0, 0.14); }
-  .osd .linked.vertical > .entry {
+      .linked.vertical > .entry:last-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: 0 -1px 0 0 #5294E2; }
+      .linked.vertical > .entry:last-child:insensitive {
+        border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
     color: #BAC3CF;
     border-color: rgba(0, 0, 0, 0.4);
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:focus {
+    .osd .entry:focus {
       color: #BAC3CF;
       border-color: #5294E2;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:insensitive {
+    .osd .entry:insensitive {
       color: #555a62;
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@@ -526,10 +523,9 @@ GtkTextView {
     .stack-switcher > .button.needs-attention > .label:dir(rtl),
     .stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
       background-position: left 3px, left 4px; }
-
-.inline-toolbar .button, .inline-toolbar .button:backdrop {
-  border-radius: 2px;
-  border-width: 1px; }
+  .inline-toolbar .button, .inline-toolbar .button:backdrop {
+    border-radius: 2px;
+    border-width: 1px; }
 
 .inline-toolbar GtkToolButton > .button {
   color: #5c616c;
@@ -801,7 +797,6 @@ GtkTextView {
 /* menu buttons */
 .menuitem.button.flat, .menuitem.sidebar-button.button {
   transition: none;
-  color: #5c616c;
   outline-offset: -1px;
   border-radius: 2px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {
diff --git a/common/gtk-3.0/3.18/gtk-contained-solid.css b/common/gtk-3.0/3.18/gtk-contained-solid.css
index 4bfdd04..3f2f5ed 100644
--- a/common/gtk-3.0/3.18/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.18/gtk-contained-solid.css
@@ -191,6 +191,17 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
+  .linked > .entry:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+    .linked > .entry:first-child:dir(rtl) {
+      border-right-style: none; }
+  .linked > .entry:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+    .linked > .entry:last-child:dir(rtl) {
+      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -217,52 +228,38 @@ GtkTextView {
       color: #5c616c; }
     .entry.image:active {
       color: #5294E2; }
-
-.linked > .entry:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0; }
-  .linked > .entry:first-child:dir(rtl) {
-    border-right-style: none; }
-
-.linked > .entry:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  border-left-style: none; }
-  .linked > .entry:last-child:dir(rtl) {
-    border-left-style: solid; }
-
-.linked.vertical > .entry {
-  border-bottom-color: #f4f5f6;
-  box-shadow: none; }
-  .linked.vertical > .entry:focus {
-    border-color: #5294E2;
-    box-shadow: 0 -1px 0 0 #5294E2; }
-  .linked.vertical > .entry:insensitive {
-    border-bottom-color: #f4f5f6; }
-  .linked.vertical > .entry:first-child {
-    border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:first-child:focus {
-      border-bottom-color: #5294E2;
-      box-shadow: none; }
-    .linked.vertical > .entry:first-child:insensitive {
-      border-bottom-color: #f4f5f6; }
-  .linked.vertical > .entry:last-child {
-    border-bottom-color: rgba(0, 0, 0, 0.14); }
-    .linked.vertical > .entry:last-child:focus {
-      border-bottom-color: #5294E2;
+  .linked.vertical > .entry {
+    border-bottom-color: #f4f5f6;
+    box-shadow: none; }
+    .linked.vertical > .entry:focus {
+      border-color: #5294E2;
       box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:last-child:insensitive {
+    .linked.vertical > .entry:insensitive {
+      border-bottom-color: #f4f5f6; }
+    .linked.vertical > .entry:first-child {
+      border-bottom-color: #f4f5f6; }
+      .linked.vertical > .entry:first-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: none; }
+      .linked.vertical > .entry:first-child:insensitive {
+        border-bottom-color: #f4f5f6; }
+    .linked.vertical > .entry:last-child {
       border-bottom-color: rgba(0, 0, 0, 0.14); }
-  .osd .linked.vertical > .entry {
+      .linked.vertical > .entry:last-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: 0 -1px 0 0 #5294E2; }
+      .linked.vertical > .entry:last-child:insensitive {
+        border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
     color: #BAC3CF;
     border-color: rgba(0, 0, 0, 0.4);
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:focus {
+    .osd .entry:focus {
       color: #BAC3CF;
       border-color: #5294E2;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:insensitive {
+    .osd .entry:insensitive {
       color: #555a62;
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@@ -526,10 +523,9 @@ GtkTextView {
     .stack-switcher > .button.needs-attention > .label:dir(rtl),
     .stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
       background-position: left 3px, left 4px; }
-
-.inline-toolbar .button, .inline-toolbar .button:backdrop {
-  border-radius: 2px;
-  border-width: 1px; }
+  .inline-toolbar .button, .inline-toolbar .button:backdrop {
+    border-radius: 2px;
+    border-width: 1px; }
 
 .inline-toolbar GtkToolButton > .button {
   color: #5c616c;
@@ -801,7 +797,6 @@ GtkTextView {
 /* menu buttons */
 .menuitem.button.flat, .menuitem.sidebar-button.button {
   transition: none;
-  color: #5c616c;
   outline-offset: -1px;
   border-radius: 2px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {
diff --git a/common/gtk-3.0/3.18/gtk-contained.css b/common/gtk-3.0/3.18/gtk-contained.css
index 6aec998..74926c1 100644
--- a/common/gtk-3.0/3.18/gtk-contained.css
+++ b/common/gtk-3.0/3.18/gtk-contained.css
@@ -191,6 +191,17 @@ GtkTextView {
     background-image: none;
     background-color: transparent;
     box-shadow: none; }
+  .linked > .entry:first-child {
+    border-top-right-radius: 0;
+    border-bottom-right-radius: 0; }
+    .linked > .entry:first-child:dir(rtl) {
+      border-right-style: none; }
+  .linked > .entry:last-child {
+    border-top-left-radius: 0;
+    border-bottom-left-radius: 0;
+    border-left-style: none; }
+    .linked > .entry:last-child:dir(rtl) {
+      border-left-style: solid; }
   .entry.error {
     color: white;
     border-color: #FC4138;
@@ -217,52 +228,38 @@ GtkTextView {
       color: #5c616c; }
     .entry.image:active {
       color: #5294E2; }
-
-.linked > .entry:first-child {
-  border-top-right-radius: 0;
-  border-bottom-right-radius: 0; }
-  .linked > .entry:first-child:dir(rtl) {
-    border-right-style: none; }
-
-.linked > .entry:last-child {
-  border-top-left-radius: 0;
-  border-bottom-left-radius: 0;
-  border-left-style: none; }
-  .linked > .entry:last-child:dir(rtl) {
-    border-left-style: solid; }
-
-.linked.vertical > .entry {
-  border-bottom-color: #f4f5f6;
-  box-shadow: none; }
-  .linked.vertical > .entry:focus {
-    border-color: #5294E2;
-    box-shadow: 0 -1px 0 0 #5294E2; }
-  .linked.vertical > .entry:insensitive {
-    border-bottom-color: #f4f5f6; }
-  .linked.vertical > .entry:first-child {
-    border-bottom-color: #f4f5f6; }
-    .linked.vertical > .entry:first-child:focus {
-      border-bottom-color: #5294E2;
-      box-shadow: none; }
-    .linked.vertical > .entry:first-child:insensitive {
-      border-bottom-color: #f4f5f6; }
-  .linked.vertical > .entry:last-child {
-    border-bottom-color: rgba(0, 0, 0, 0.14); }
-    .linked.vertical > .entry:last-child:focus {
-      border-bottom-color: #5294E2;
+  .linked.vertical > .entry {
+    border-bottom-color: #f4f5f6;
+    box-shadow: none; }
+    .linked.vertical > .entry:focus {
+      border-color: #5294E2;
       box-shadow: 0 -1px 0 0 #5294E2; }
-    .linked.vertical > .entry:last-child:insensitive {
+    .linked.vertical > .entry:insensitive {
+      border-bottom-color: #f4f5f6; }
+    .linked.vertical > .entry:first-child {
+      border-bottom-color: #f4f5f6; }
+      .linked.vertical > .entry:first-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: none; }
+      .linked.vertical > .entry:first-child:insensitive {
+        border-bottom-color: #f4f5f6; }
+    .linked.vertical > .entry:last-child {
       border-bottom-color: rgba(0, 0, 0, 0.14); }
-  .osd .linked.vertical > .entry {
+      .linked.vertical > .entry:last-child:focus {
+        border-bottom-color: #5294E2;
+        box-shadow: 0 -1px 0 0 #5294E2; }
+      .linked.vertical > .entry:last-child:insensitive {
+        border-bottom-color: rgba(0, 0, 0, 0.14); }
+  .osd .entry {
     color: #BAC3CF;
     border-color: rgba(0, 0, 0, 0.4);
     background-color: transparent;
     background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:focus {
+    .osd .entry:focus {
       color: #BAC3CF;
       border-color: #5294E2;
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.2)); }
-    .osd .linked.vertical > .entry:insensitive {
+    .osd .entry:insensitive {
       color: #555a62;
       border-color: rgba(0, 0, 0, 0.4);
       background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.1)); }
@@ -526,10 +523,9 @@ GtkTextView {
     .stack-switcher > .button.needs-attention > .label:dir(rtl),
     .stack-switcher > .button.needs-attention > GtkImage:dir(rtl), .button .sidebar-item.needs-attention > GtkLabel:dir(rtl) {
       background-position: left 3px, left 4px; }
-
-.inline-toolbar .button, .inline-toolbar .button:backdrop {
-  border-radius: 2px;
-  border-width: 1px; }
+  .inline-toolbar .button, .inline-toolbar .button:backdrop {
+    border-radius: 2px;
+    border-width: 1px; }
 
 .inline-toolbar GtkToolButton > .button {
   color: #5c616c;
@@ -801,7 +797,6 @@ GtkTextView {
 /* menu buttons */
 .menuitem.button.flat, .menuitem.sidebar-button.button {
   transition: none;
-  color: #5c616c;
   outline-offset: -1px;
   border-radius: 2px; }
   .menuitem.button.flat:hover, .menuitem.sidebar-button.button:hover {
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index e62811a..4b1c0c7 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -256,6 +256,20 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
     box-shadow: none;
   }
 
+  .linked > & { //FIXME: use same buttons linking logic and template
+    &:first-child {
+      border-top-right-radius: 0;
+      border-bottom-right-radius: 0;
+      &:dir(rtl) { border-right-style: none;}
+    }
+    &:last-child {
+      border-top-left-radius: 0;
+      border-bottom-left-radius: 0;
+      border-left-style: none;
+      &:dir(rtl) { border-left-style: solid; }
+    }
+  }
+
   &.error {
     color: white;
     border-color: $error_color;
@@ -290,71 +304,52 @@ GtkTextView { // This will get overridden by .view, needed by gedit line numbers
     &:active { color: $selected_bg_color; }
   }
 
-//  .osd & {
-//    @include entry(osd);
-//    &:focus { @include entry(osd-focus); }
-//    &:insensitive { @include entry(osd-insensitive); }
-//  }
-}
-
-.linked > .entry { //FIXME: use same buttons linking logic and template
-  &:first-child {
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    &:dir(rtl) { border-right-style: none;}
-  }
-  &:last-child {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-left-style: none;
-    &:dir(rtl) { border-left-style: solid; }
-  }
-}
-
-.linked.vertical > .entry { //FIXME comment stuff and make the whole thing smarter.
-  border-bottom-color: mix($borders_color, $base_color, 30%);
-  box-shadow: none;
-  @extend %linked_vertical;
-
-  &:focus {
-    border-color: $selected_bg_color;
-    box-shadow: 0 -1px 0 0 $selected_bg_color;
-    @extend %linked_vertical;
-  }
-
-  &:insensitive {
+  .linked.vertical > & { //FIXME comment stuff and make the whole thing smarter.
     border-bottom-color: mix($borders_color, $base_color, 30%);
+    box-shadow: none;
     @extend %linked_vertical;
-  }
-
-  &:first-child {
-    border-bottom-color: mix($borders_color, $base_color, 30%);
 
     &:focus {
-      border-bottom-color: $selected_bg_color;
-      box-shadow: none;
+      border-color: $selected_bg_color;
+      box-shadow: 0 -1px 0 0 $selected_bg_color;
+      @extend %linked_vertical;
     }
 
     &:insensitive {
       border-bottom-color: mix($borders_color, $base_color, 30%);
-      @extend %linked_vertical:first-child;
+      @extend %linked_vertical;
     }
-  }
 
-  &:last-child {
-    border-bottom-color: rgba(0,0,0,0.14);
-    &:focus {
-      border-bottom-color: $selected_bg_color;
-      box-shadow: 0 -1px 0 0 $selected_bg_color;
-      @extend %linked_vertical:last-child;
+    &:first-child {
+      border-bottom-color: mix($borders_color, $base_color, 30%);
+
+      &:focus {
+        border-bottom-color: $selected_bg_color;
+        box-shadow: none;
+      }
+
+      &:insensitive {
+        border-bottom-color: mix($borders_color, $base_color, 30%);
+        @extend %linked_vertical:first-child;
+      }
     }
 
-    &:insensitive {
+    &:last-child {
       border-bottom-color: rgba(0,0,0,0.14);
-      @extend %linked_vertical:last-child;
+      &:focus {
+        border-bottom-color: $selected_bg_color;
+        box-shadow: 0 -1px 0 0 $selected_bg_color;
+        @extend %linked_vertical:last-child;
+      }
 
+      &:insensitive {
+        border-bottom-color: rgba(0,0,0,0.14);
+        @extend %linked_vertical:last-child;
+
+      }
     }
   }
+
   .osd & {
     @include entry(osd);
     &:focus { @include entry(osd-focus); }
@@ -612,24 +607,24 @@ $_dot_color: $selected_bg_color;
       @else { background-position: left 3px, left 2px; }
     }
   }
-}
 
-//inline-toolbar buttons
-.inline-toolbar .button, .inline-toolbar .button:backdrop {
-  border-radius: 2px;
-  border-width: 1px;
-  @extend %linked;
-}
+  //inline-toolbar buttons
+  .inline-toolbar &, .inline-toolbar &:backdrop {
+    border-radius: 2px;
+    border-width: 1px;
+    @extend %linked;
+  }
 
-.linked > .button,
-.linked > .button:hover,
-.linked > .button:active,
-.linked > .button:checked { @extend %linked; }
+  .linked > &,
+  .linked > &:hover,
+  .linked > &:active,
+  .linked > &:checked { @extend %linked; }
 
-.linked.vertical > .button,
-.linked.vertical > .button:hover,
-.linked.vertical > .button:active,
-.linked.vertical > .button:checked { @extend %linked_vertical; }
+  .linked.vertical > &,
+  .linked.vertical > &:hover,
+  .linked.vertical > &:active,
+  .linked.vertical > &:checked { @extend %linked_vertical; }
+}
 
 // all the following is for the +|- buttons on inline toolbars, that way
 // should really be deprecated...
@@ -735,10 +730,8 @@ $_dot_color: $selected_bg_color;
 
 /* menu buttons */
 .menuitem.button.flat {
-  @extend %undecorated_button;
-
   transition: none;
-  color: $fg_color;
+  @extend %undecorated_button;
   outline-offset: -1px;
   border-radius: 2px;