sync with master

41 files changed, 903 insertions, 1181 deletions

diff --git a/common/gtk-3.0/3.20/assets.svg b/common/gtk-3.0/3.20/assets.svg
index b1ca40c..db616b6 100644
--- a/common/gtk-3.0/3.20/assets.svg
+++ b/common/gtk-3.0/3.20/assets.svg
@@ -24,9 +24,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8"
-     inkscape:cx="176.38504"
-     inkscape:cy="151.27384"
+     inkscape:zoom="4"
+     inkscape:cx="117.91346"
+     inkscape:cy="193.93448"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -2239,7 +2239,7 @@
      style="display:inline"
      transform="translate(8.000005,285.63782)">
     <g
-       id="titlebutton-min"
+       id="titlebutton-minimize"
        inkscape:label="#g6247"
        transform="translate(-471,-43)"
        style="opacity:0.8">
@@ -2652,7 +2652,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:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
     <g
-       id="titlebutton-max"
+       id="titlebutton-maximize"
        inkscape:label="#g6234"
        transform="translate(-480,-43)"
        style="opacity:0.8">
@@ -2765,7 +2765,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:1;fill:#f8f8f9;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
     <g
-       id="titlebutton-max-hover"
+       id="titlebutton-maximize-hover"
        inkscape:label="#g6284"
        transform="translate(-377,-9)">
       <g
@@ -2851,7 +2851,7 @@
          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" />
     </g>
     <g
-       id="titlebutton-min-hover"
+       id="titlebutton-minimize-hover"
        inkscape:label="#g6308"
        transform="translate(-368,-9)">
       <g
@@ -3019,7 +3019,7 @@
          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" />
     </g>
     <g
-       id="titlebutton-max-active"
+       id="titlebutton-maximize-active"
        inkscape:label="#g6356"
        transform="translate(-276,8)">
       <g
@@ -3109,7 +3109,7 @@
          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" />
     </g>
     <g
-       id="titlebutton-min-active"
+       id="titlebutton-minimize-active"
        inkscape:label="#g6414"
        transform="translate(-267,8)">
       <g
@@ -3199,7 +3199,7 @@
          y="-185.63782" />
     </g>
     <g
-       id="titlebutton-max-backdrop"
+       id="titlebutton-maximize-backdrop"
        inkscape:label="#g6521"
        style="opacity:0.45"
        transform="translate(-480,-43)">
@@ -3232,7 +3232,7 @@
          y="-168.63782" />
     </g>
     <g
-       id="titlebutton-min-backdrop"
+       id="titlebutton-minimize-backdrop"
        inkscape:label="#g6534"
        style="opacity:0.45"
        transform="translate(-471,-43)">
@@ -4648,7 +4648,7 @@
     </g>
     <g
        style="display:inline;opacity:0.7"
-       id="titlebutton-min-dark"
+       id="titlebutton-minimize-dark"
        inkscape:label="#g6247"
        transform="translate(-229.00002,-43.000019)">
       <g
@@ -4757,7 +4757,7 @@
     </g>
     <g
        style="display:inline;opacity:0.7"
-       id="titlebutton-max-dark"
+       id="titlebutton-maximize-dark"
        inkscape:label="#g6234"
        transform="translate(-238.00002,-43.000019)">
       <g
@@ -4866,7 +4866,7 @@
     </g>
     <g
        style="display:inline"
-       id="titlebutton-max-hover-dark"
+       id="titlebutton-maximize-hover-dark"
        inkscape:label="#g6284"
        transform="translate(-135.00001,-9.0000206)">
       <g
@@ -4953,7 +4953,7 @@
     </g>
     <g
        style="display:inline"
-       id="titlebutton-min-hover-dark"
+       id="titlebutton-minimize-hover-dark"
        inkscape:label="#g6308"
        transform="translate(-126.00001,-9.0000206)">
       <g
@@ -5116,7 +5116,7 @@
     </g>
     <g
        style="display:inline"
-       id="titlebutton-max-active-dark"
+       id="titlebutton-maximize-active-dark"
        inkscape:label="#g6356"
        transform="translate(-34.000017,7.9999889)">
       <g
@@ -5207,7 +5207,7 @@
     </g>
     <g
        style="display:inline"
-       id="titlebutton-min-active-dark"
+       id="titlebutton-minimize-active-dark"
        inkscape:label="#g6414"
        transform="translate(-25.000017,7.9999889)">
       <g
@@ -5297,7 +5297,7 @@
          y="-185.63782" />
     </g>
     <g
-       id="titlebutton-max-backdrop-dark"
+       id="titlebutton-maximize-backdrop-dark"
        inkscape:label="#g6521"
        style="display:inline;opacity:0.4"
        transform="translate(-238.00002,-43.000019)">
@@ -5330,7 +5330,7 @@
          y="-168.63782" />
     </g>
     <g
-       id="titlebutton-min-backdrop-dark"
+       id="titlebutton-minimize-backdrop-dark"
        inkscape:label="#g6534"
        style="display:inline;opacity:0.4"
        transform="translate(-229.00002,-43.000019)">
diff --git a/common/gtk-3.0/3.20/assets.txt b/common/gtk-3.0/3.20/assets.txt
index 6746aca..a11af04 100644
--- a/common/gtk-3.0/3.20/assets.txt
+++ b/common/gtk-3.0/3.20/assets.txt
@@ -40,14 +40,14 @@ titlebutton-close
 titlebutton-close-backdrop
 titlebutton-close-hover
 titlebutton-close-active
-titlebutton-max
-titlebutton-max-backdrop
-titlebutton-max-hover
-titlebutton-max-active
-titlebutton-min
-titlebutton-min-backdrop
-titlebutton-min-hover
-titlebutton-min-active
+titlebutton-maximize
+titlebutton-maximize-backdrop
+titlebutton-maximize-hover
+titlebutton-maximize-active
+titlebutton-minimize
+titlebutton-minimize-backdrop
+titlebutton-minimize-hover
+titlebutton-minimize-active
 checkbox-checked-dark
 checkbox-checked-insensitive-dark
 checkbox-unchecked-dark
@@ -74,11 +74,11 @@ 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
+titlebutton-maximize-dark
+titlebutton-maximize-backdrop-dark
+titlebutton-maximize-hover-dark
+titlebutton-maximize-active-dark
+titlebutton-minimize-dark
+titlebutton-minimize-backdrop-dark
+titlebutton-minimize-hover-dark
+titlebutton-minimize-active-dark
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-active-dark.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-active-dark.png
index c6a82b7..c6a82b7 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-active-dark.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-active-dark.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-active-dark@2.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-active-dark@2.png
index 5ed5c6c..5ed5c6c 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-active-dark@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-active-dark@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-active.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-active.png
index c6a82b7..c6a82b7 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-active.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-active.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-active@2.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-active@2.png
index 5ed5c6c..5ed5c6c 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-active@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-active@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-backdrop-dark.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-backdrop-dark.png
index 0883ca7..0883ca7 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-backdrop-dark.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-backdrop-dark.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-backdrop-dark@2.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-backdrop-dark@2.png
index 4542b7f..4542b7f 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-backdrop-dark@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-backdrop-dark@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-backdrop.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-backdrop.png
index 36858b0..36858b0 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-backdrop.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-backdrop.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-backdrop@2.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-backdrop@2.png
index 061e356..061e356 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-backdrop@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-backdrop@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-dark.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-dark.png
index 8addbf8..8addbf8 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-dark.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-dark.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-dark@2.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-dark@2.png
index dedcc38..dedcc38 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-dark@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-dark@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-hover-dark.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-hover-dark.png
index 84a5583..84a5583 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-hover-dark.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-hover-dark.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-hover-dark@2.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-hover-dark@2.png
index d2ef62a..d2ef62a 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-hover-dark@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-hover-dark@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-hover.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-hover.png
index 128a39d..128a39d 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-hover.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-hover.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max-hover@2.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize-hover@2.png
index 66cdeda..66cdeda 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max-hover@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize-hover@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize.png
index 14e5e3e..14e5e3e 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-max@2.png b/common/gtk-3.0/3.20/assets/titlebutton-maximize@2.png
index a1a13bb..a1a13bb 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-max@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-maximize@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-active-dark.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-active-dark.png
index 4785503..4785503 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-active-dark.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-active-dark.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-active-dark@2.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-active-dark@2.png
index fb9325f..fb9325f 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-active-dark@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-active-dark@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-active.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-active.png
index 4785503..4785503 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-active.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-active.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-active@2.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-active@2.png
index fb9325f..fb9325f 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-active@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-active@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-backdrop-dark.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-backdrop-dark.png
index b04db91..b04db91 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-backdrop-dark.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-backdrop-dark.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-backdrop-dark@2.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-backdrop-dark@2.png
index 5b8cf4d..5b8cf4d 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-backdrop-dark@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-backdrop-dark@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-backdrop.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-backdrop.png
index b83cb7d..b83cb7d 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-backdrop.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-backdrop.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-backdrop@2.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-backdrop@2.png
index f83b673..f83b673 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-backdrop@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-backdrop@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-dark.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-dark.png
index b5c9732..b5c9732 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-dark.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-dark.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-dark@2.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-dark@2.png
index 29b6465..29b6465 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-dark@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-dark@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-hover-dark.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-hover-dark.png
index c38e8b3..c38e8b3 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-hover-dark.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-hover-dark.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-hover-dark@2.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-hover-dark@2.png
index 59b63da..59b63da 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-hover-dark@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-hover-dark@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-hover.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-hover.png
index c250748..c250748 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-hover.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-hover.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min-hover@2.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize-hover@2.png
index 965ce3d..965ce3d 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min-hover@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize-hover@2.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize.png
index f4b6db0..f4b6db0 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize.png
diff --git a/common/gtk-3.0/3.20/assets/titlebutton-min@2.png b/common/gtk-3.0/3.20/assets/titlebutton-minimize@2.png
index 9a35819..9a35819 100644
--- a/common/gtk-3.0/3.20/assets/titlebutton-min@2.png
+++ b/common/gtk-3.0/3.20/assets/titlebutton-minimize@2.png
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 3206e73..376d8cf 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -349,6 +349,9 @@ button {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+    box-shadow: none; }
   button.suggested-action {
     background-clip: border-box;
     color: #ffffff;
@@ -491,94 +494,86 @@ button {
     .inline-toolbar toolbutton > button:disabled:active > label, .inline-toolbar toolbutton > button:disabled:checked > label {
       color: inherit; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry, .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.linked:not(.vertical):not(.path-bar) > entry + entry, .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(43, 46, 57, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
   border-left-color: rgba(43, 46, 57, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.warning + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
   border-left-color: rgba(43, 46, 57, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
   border-left-color: rgba(43, 46, 57, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button, .linked:not(.vertical):not(.pathbar) > spinbutton + button,
-.linked:not(.vertical):not(.pathbar) > entry + button:hover,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:hover,
-.linked:not(.vertical):not(.pathbar) > entry + button:active,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:active,
-.linked:not(.vertical):not(.pathbar) > entry + button:checked,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:checked,
-.linked:not(.vertical):not(.pathbar) > entry + button:disabled,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:disabled {
-  border-left-style: solid; }
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+  border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > button:checked + entry, .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active):not(:only-child),
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: -1px 0 #2b2e39; }
+.linked:not(.vertical):not(.path-bar) > button + button {
+  border-left-style: none; }
 
-.linked:not(.vertical):not(.pathbar) > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 1px 0 #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + button:not(:checked):not(:active):hover {
+.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active),
+.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover,
+.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked:not(.vertical):not(.path-bar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
-  border-left-color: #2b2e39; }
-
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
-  box-shadow: none; }
+.linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
 
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); }
@@ -616,31 +611,6 @@ button {
 .linked.vertical > spinbutton + spinbutton:focus:last-child {
   border-top-color: #2b2e39; }
 
-.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked.vertical > entry + entry.warning:focus:last-child,
-.linked.vertical > spinbutton + entry.warning:focus:last-child,
-.linked.vertical > entry + spinbutton.warning:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
-  border-top-color: #2b2e39; }
-
-.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked.vertical > entry + entry.error:focus:last-child,
-.linked.vertical > spinbutton + entry.error:focus:last-child,
-.linked.vertical > entry + spinbutton.error:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
-  border-top-color: #2b2e39; }
-
-.linked.vertical > entry + button, .linked.vertical > spinbutton + button,
-.linked.vertical > entry + button:hover,
-.linked.vertical > spinbutton + button:hover,
-.linked.vertical > entry + button:active,
-.linked.vertical > spinbutton + button:active,
-.linked.vertical > entry + button:checked,
-.linked.vertical > spinbutton + button:checked,
-.linked.vertical > entry + button:disabled,
-.linked.vertical > spinbutton + button:disabled {
-  border-top-style: solid; }
-
 .linked.vertical > entry:focus:not(:only-child) + entry, .linked.vertical > spinbutton:focus:not(:only-child) + entry, .linked.vertical > entry:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry:focus:not(:only-child) + button,
 .linked.vertical > spinbutton:focus:not(:only-child) + button,
@@ -648,6 +618,13 @@ button {
 .linked.vertical > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #2b2e39; }
 
+.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked.vertical > entry + entry.warning:focus:last-child,
+.linked.vertical > spinbutton + entry.warning:focus:last-child,
+.linked.vertical > entry + spinbutton.warning:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
+  border-top-color: #2b2e39; }
+
 .linked.vertical > entry.warning:focus:not(:only-child) + entry, .linked.vertical > spinbutton.warning:focus:not(:only-child) + entry, .linked.vertical > entry.warning:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.warning:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.warning:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + button,
@@ -655,6 +632,13 @@ button {
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #2b2e39; }
 
+.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked.vertical > entry + entry.error:focus:last-child,
+.linked.vertical > spinbutton + entry.error:focus:last-child,
+.linked.vertical > entry + spinbutton.error:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
+  border-top-color: #2b2e39; }
+
 .linked.vertical > entry.error:focus:not(:only-child) + entry, .linked.vertical > spinbutton.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.error:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.error:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.error:focus:not(:only-child) + button,
@@ -662,26 +646,28 @@ button {
 .linked.vertical > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #2b2e39; }
 
-.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
-.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: 0 -1px #2b2e39; }
-
-.linked.vertical > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
-
-.linked.vertical > button:checked + button:not(:checked):not(:active):hover {
-  box-shadow: none; }
-
 .linked.vertical > button:checked + entry, .linked.vertical > button:checked + spinbutton {
   border-top-color: #2b2e39; }
 
-.linked.vertical > entry + button:not(:checked):not(:active):hover, .linked.vertical > spinbutton + button:not(:checked):not(:active):hover {
+.linked.vertical > button + button {
+  border-top-style: none; }
+
+.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 0 1px #2b2e39; }
+
+.linked.vertical > button:first-child:hover:not(:checked):not(:active),
+.linked.vertical > button:checked + button:not(:checked):not(:active):hover,
+.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked.vertical > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
-toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
+toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, .linked:not(.vertical) > spinbutton,
+.linked:not(.vertical) > entry:focus,
+.linked:not(.vertical) > spinbutton:focus, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
 .linked:not(.vertical) > button:hover,
 .linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .linked:not(.vertical):not(.pathbar) > entry, .linked:not(.vertical):not(.pathbar) > spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
+.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
@@ -689,59 +675,41 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b
   border-radius: 0;
   border-right-style: none; }
 
-.inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 
-.inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
 
-.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > button,
+.linked.vertical > entry, .linked.vertical > spinbutton,
+.linked.vertical > entry:focus,
+.linked.vertical > spinbutton:focus, .linked.vertical > button,
 .linked.vertical > button:hover,
 .linked.vertical > button:active,
-.linked.vertical > button:checked, .linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > combobox > button.combo {
+.linked.vertical > button:checked, .linked.vertical > combobox > button.combo {
   border-radius: 0;
   border-bottom-style: none; }
 
-.linked.vertical > button:first-child, .linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
 
-.linked.vertical > button:last-child, .linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
 
-.linked.vertical > button:only-child, .linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
-.linked:not(.vertical) > button,
-.linked:not(.vertical) > button:hover,
-.linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:disabled {
-  border-left-style: none; }
-  .linked:not(.vertical) > button:first-child, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
-    border-left-style: solid; }
-
-.linked.vertical > button,
-.linked.vertical > button:hover,
-.linked.vertical > button:active,
-.linked.vertical > button:checked {
-  border-top-style: none; }
-  .linked.vertical > button:first-child {
-    border-top-style: solid; }
-
 menuitem.button.flat,
 modelbutton.flat, button:link, button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, menu arrow,
 .menu arrow, notebook header tab button, notebook header tab button:hover, notebook header tab button:active, notebook header tab button:active:hover, .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.flat:disabled, .app-notification button.sidebar-button:disabled, TerminalWindow .notebook tab:active button, TerminalWindow .notebook tab:hover button, TerminalWindow .notebook tab:active button:hover, TerminalWindow .notebook tab:hover button:hover, TerminalWindow .notebook tab:active button:active, TerminalWindow .notebook tab:hover button:active {
@@ -1156,43 +1124,49 @@ headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, he
   .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled {
     color: rgba(207, 218, 231, 0.4); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
   border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
   border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
   border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
+  border-left-color: rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
 .primary-toolbar button.suggested-action, headerbar button.suggested-action {
@@ -2869,28 +2843,28 @@ headerbar button.titlebutton,
     background-image: -gtk-scaled(url("assets/titlebutton-close-active-dark.png"), url("assets/titlebutton-close-active-dark@2.png")); }
   headerbar button.titlebutton.maximize,
   .titlebar button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-dark.png"), url("assets/titlebutton-max-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-dark.png"), url("assets/titlebutton-maximize-dark@2.png")); }
   headerbar button.titlebutton.maximize:backdrop,
   .titlebar button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop-dark.png"), url("assets/titlebutton-max-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop-dark.png"), url("assets/titlebutton-maximize-backdrop-dark@2.png")); }
   headerbar button.titlebutton.maximize:hover,
   .titlebar button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover-dark.png"), url("assets/titlebutton-max-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover-dark.png"), url("assets/titlebutton-maximize-hover-dark@2.png")); }
   headerbar button.titlebutton.maximize:active,
   .titlebar button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active-dark.png"), url("assets/titlebutton-max-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active-dark.png"), url("assets/titlebutton-maximize-active-dark@2.png")); }
   headerbar button.titlebutton.minimize,
   .titlebar button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-dark.png"), url("assets/titlebutton-min-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-dark.png"), url("assets/titlebutton-minimize-dark@2.png")); }
   headerbar button.titlebutton.minimize:backdrop,
   .titlebar button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop-dark.png"), url("assets/titlebutton-min-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop-dark.png"), url("assets/titlebutton-minimize-backdrop-dark@2.png")); }
   headerbar button.titlebutton.minimize:hover,
   .titlebar button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover-dark.png"), url("assets/titlebutton-min-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover-dark.png"), url("assets/titlebutton-minimize-hover-dark@2.png")); }
   headerbar button.titlebutton.minimize:active,
   .titlebar button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active-dark.png"), url("assets/titlebutton-min-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active-dark.png"), url("assets/titlebutton-minimize-active-dark@2.png")); }
 
 .view:selected,
 .view selection,
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index f3d8f55..94a1597 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -348,6 +348,9 @@ button {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+    box-shadow: none; }
   button.suggested-action {
     background-clip: border-box;
     color: #ffffff;
@@ -490,95 +493,87 @@ button {
     .inline-toolbar toolbutton > button:disabled:active > label, .inline-toolbar toolbutton > button:disabled:checked > label {
       color: inherit; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry, .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.linked:not(.vertical):not(.path-bar) > entry + entry, .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(207, 214, 230, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.warning + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
   border-left-color: #F27835; }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
-  border-left-color: #F27835; }
-
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
-  border-left-color: #FC4138; }
-
-.linked:not(.vertical):not(.pathbar) > entry + button, .linked:not(.vertical):not(.pathbar) > spinbutton + button,
-.linked:not(.vertical):not(.pathbar) > entry + button:hover,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:hover,
-.linked:not(.vertical):not(.pathbar) > entry + button:active,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:active,
-.linked:not(.vertical):not(.pathbar) > entry + button:checked,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:checked,
-.linked:not(.vertical):not(.pathbar) > entry + button:disabled,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:disabled {
-  border-left-style: solid; }
-
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
+  border-left-color: #F27835; }
+
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #F27835; }
 
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active):not(:only-child),
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: -1px 0 #cfd6e6; }
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+  border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
+.linked:not(.vertical):not(.path-bar) > button:checked + entry, .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
+  border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + button:not(:checked):not(:active):hover {
-  box-shadow: none; }
+.linked:not(.vertical):not(.path-bar) > button + button {
+  border-left-style: none; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
-  border-left-color: #5294E2; }
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 1px 0 #cfd6e6; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
+.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active),
+.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover,
+.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked:not(.vertical):not(.path-bar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
+.linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
+
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
 
@@ -615,31 +610,6 @@ button {
 .linked.vertical > spinbutton + spinbutton:focus:last-child {
   border-top-color: #5294E2; }
 
-.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked.vertical > entry + entry.warning:focus:last-child,
-.linked.vertical > spinbutton + entry.warning:focus:last-child,
-.linked.vertical > entry + spinbutton.warning:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
-  border-top-color: #F27835; }
-
-.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked.vertical > entry + entry.error:focus:last-child,
-.linked.vertical > spinbutton + entry.error:focus:last-child,
-.linked.vertical > entry + spinbutton.error:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
-  border-top-color: #FC4138; }
-
-.linked.vertical > entry + button, .linked.vertical > spinbutton + button,
-.linked.vertical > entry + button:hover,
-.linked.vertical > spinbutton + button:hover,
-.linked.vertical > entry + button:active,
-.linked.vertical > spinbutton + button:active,
-.linked.vertical > entry + button:checked,
-.linked.vertical > spinbutton + button:checked,
-.linked.vertical > entry + button:disabled,
-.linked.vertical > spinbutton + button:disabled {
-  border-top-style: solid; }
-
 .linked.vertical > entry:focus:not(:only-child) + entry, .linked.vertical > spinbutton:focus:not(:only-child) + entry, .linked.vertical > entry:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry:focus:not(:only-child) + button,
 .linked.vertical > spinbutton:focus:not(:only-child) + button,
@@ -647,6 +617,13 @@ button {
 .linked.vertical > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #5294E2; }
 
+.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked.vertical > entry + entry.warning:focus:last-child,
+.linked.vertical > spinbutton + entry.warning:focus:last-child,
+.linked.vertical > entry + spinbutton.warning:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
+  border-top-color: #F27835; }
+
 .linked.vertical > entry.warning:focus:not(:only-child) + entry, .linked.vertical > spinbutton.warning:focus:not(:only-child) + entry, .linked.vertical > entry.warning:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.warning:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.warning:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + button,
@@ -654,6 +631,13 @@ button {
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #F27835; }
 
+.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked.vertical > entry + entry.error:focus:last-child,
+.linked.vertical > spinbutton + entry.error:focus:last-child,
+.linked.vertical > entry + spinbutton.error:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
+  border-top-color: #FC4138; }
+
 .linked.vertical > entry.error:focus:not(:only-child) + entry, .linked.vertical > spinbutton.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.error:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.error:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.error:focus:not(:only-child) + button,
@@ -661,26 +645,28 @@ button {
 .linked.vertical > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #FC4138; }
 
-.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
-.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: 0 -1px #cfd6e6; }
-
-.linked.vertical > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
-
-.linked.vertical > button:checked + button:not(:checked):not(:active):hover {
-  box-shadow: none; }
-
 .linked.vertical > button:checked + entry, .linked.vertical > button:checked + spinbutton {
   border-top-color: #5294E2; }
 
-.linked.vertical > entry + button:not(:checked):not(:active):hover, .linked.vertical > spinbutton + button:not(:checked):not(:active):hover {
+.linked.vertical > button + button {
+  border-top-style: none; }
+
+.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 0 1px #cfd6e6; }
+
+.linked.vertical > button:first-child:hover:not(:checked):not(:active),
+.linked.vertical > button:checked + button:not(:checked):not(:active):hover,
+.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked.vertical > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
-toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
+toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, .linked:not(.vertical) > spinbutton,
+.linked:not(.vertical) > entry:focus,
+.linked:not(.vertical) > spinbutton:focus, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
 .linked:not(.vertical) > button:hover,
 .linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .linked:not(.vertical):not(.pathbar) > entry, .linked:not(.vertical):not(.pathbar) > spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
+.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
@@ -688,59 +674,41 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b
   border-radius: 0;
   border-right-style: none; }
 
-.inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 
-.inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
 
-.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > button,
+.linked.vertical > entry, .linked.vertical > spinbutton,
+.linked.vertical > entry:focus,
+.linked.vertical > spinbutton:focus, .linked.vertical > button,
 .linked.vertical > button:hover,
 .linked.vertical > button:active,
-.linked.vertical > button:checked, .linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > combobox > button.combo {
+.linked.vertical > button:checked, .linked.vertical > combobox > button.combo {
   border-radius: 0;
   border-bottom-style: none; }
 
-.linked.vertical > button:first-child, .linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
 
-.linked.vertical > button:last-child, .linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
 
-.linked.vertical > button:only-child, .linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
-.linked:not(.vertical) > button,
-.linked:not(.vertical) > button:hover,
-.linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:disabled {
-  border-left-style: none; }
-  .linked:not(.vertical) > button:first-child, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
-    border-left-style: solid; }
-
-.linked.vertical > button,
-.linked.vertical > button:hover,
-.linked.vertical > button:active,
-.linked.vertical > button:checked {
-  border-top-style: none; }
-  .linked.vertical > button:first-child {
-    border-top-style: solid; }
-
 menuitem.button.flat,
 modelbutton.flat, button:link, button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, menu arrow,
 .menu arrow, notebook header tab button, notebook header tab button:hover, notebook header tab button:active, notebook header tab button:active:hover, .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.flat:disabled, .app-notification button.sidebar-button:disabled, TerminalWindow .notebook tab:active button, TerminalWindow .notebook tab:hover button, TerminalWindow .notebook tab:active button:hover, TerminalWindow .notebook tab:hover button:hover, TerminalWindow .notebook tab:active button:active, TerminalWindow .notebook tab:hover button:active {
@@ -1155,44 +1123,50 @@ headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, he
   .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled {
     color: rgba(207, 218, 231, 0.4); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37), inset -1px 0 rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
-  border-left-color: #FC4138; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
+  border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
-  border-left-color: #F27835; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
+  border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
-  border-left-color: #FC4138; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
+  border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
-  border-left-color: #F27835; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+  border-left-color: rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
-  border-left-color: #FC4138; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
+  border-left-color: rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-left-color: rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
-  border-left-color: #F27835; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
+  border-left-color: rgba(21, 23, 28, 0.37); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo {
-  border-left-color: #FC4138; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+  border-left-color: rgba(21, 23, 28, 0.37); }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
+  border-left-color: rgba(21, 23, 28, 0.37); }
 
 .primary-toolbar button.suggested-action, headerbar button.suggested-action {
   background-clip: border-box;
@@ -2868,28 +2842,28 @@ headerbar button.titlebutton,
     background-image: -gtk-scaled(url("assets/titlebutton-close-active-dark.png"), url("assets/titlebutton-close-active-dark@2.png")); }
   headerbar button.titlebutton.maximize,
   .titlebar button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-dark.png"), url("assets/titlebutton-max-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-dark.png"), url("assets/titlebutton-maximize-dark@2.png")); }
   headerbar button.titlebutton.maximize:backdrop,
   .titlebar button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop-dark.png"), url("assets/titlebutton-max-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop-dark.png"), url("assets/titlebutton-maximize-backdrop-dark@2.png")); }
   headerbar button.titlebutton.maximize:hover,
   .titlebar button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover-dark.png"), url("assets/titlebutton-max-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover-dark.png"), url("assets/titlebutton-maximize-hover-dark@2.png")); }
   headerbar button.titlebutton.maximize:active,
   .titlebar button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active-dark.png"), url("assets/titlebutton-max-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active-dark.png"), url("assets/titlebutton-maximize-active-dark@2.png")); }
   headerbar button.titlebutton.minimize,
   .titlebar button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-dark.png"), url("assets/titlebutton-min-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-dark.png"), url("assets/titlebutton-minimize-dark@2.png")); }
   headerbar button.titlebutton.minimize:backdrop,
   .titlebar button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop-dark.png"), url("assets/titlebutton-min-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop-dark.png"), url("assets/titlebutton-minimize-backdrop-dark@2.png")); }
   headerbar button.titlebutton.minimize:hover,
   .titlebar button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover-dark.png"), url("assets/titlebutton-min-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover-dark.png"), url("assets/titlebutton-minimize-hover-dark@2.png")); }
   headerbar button.titlebutton.minimize:active,
   .titlebar button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active-dark.png"), url("assets/titlebutton-min-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active-dark.png"), url("assets/titlebutton-minimize-active-dark@2.png")); }
 
 .view:selected,
 .view selection,
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index 0133382..2da06ea 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -349,6 +349,9 @@ button {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+    box-shadow: none; }
   button.suggested-action {
     background-clip: border-box;
     color: #ffffff;
@@ -491,94 +494,86 @@ button {
     .inline-toolbar toolbutton > button:disabled:active > label, .inline-toolbar toolbutton > button:disabled:checked > label {
       color: inherit; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry, .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.linked:not(.vertical):not(.path-bar) > entry + entry, .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(43, 46, 57, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
   border-left-color: rgba(43, 46, 57, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.warning + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
   border-left-color: rgba(43, 46, 57, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
   border-left-color: rgba(43, 46, 57, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button, .linked:not(.vertical):not(.pathbar) > spinbutton + button,
-.linked:not(.vertical):not(.pathbar) > entry + button:hover,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:hover,
-.linked:not(.vertical):not(.pathbar) > entry + button:active,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:active,
-.linked:not(.vertical):not(.pathbar) > entry + button:checked,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:checked,
-.linked:not(.vertical):not(.pathbar) > entry + button:disabled,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:disabled {
-  border-left-style: solid; }
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+  border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > button:checked + entry, .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
   border-left-color: #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active):not(:only-child),
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: -1px 0 #2b2e39; }
+.linked:not(.vertical):not(.path-bar) > button + button {
+  border-left-style: none; }
 
-.linked:not(.vertical):not(.pathbar) > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 1px 0 #2b2e39; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + button:not(:checked):not(:active):hover {
+.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active),
+.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover,
+.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked:not(.vertical):not(.path-bar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
-  border-left-color: #2b2e39; }
-
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
-  box-shadow: none; }
+.linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
 
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(43, 46, 57, 0.5), inset -1px 0 rgba(43, 46, 57, 0.5); }
@@ -616,31 +611,6 @@ button {
 .linked.vertical > spinbutton + spinbutton:focus:last-child {
   border-top-color: #2b2e39; }
 
-.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked.vertical > entry + entry.warning:focus:last-child,
-.linked.vertical > spinbutton + entry.warning:focus:last-child,
-.linked.vertical > entry + spinbutton.warning:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
-  border-top-color: #2b2e39; }
-
-.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked.vertical > entry + entry.error:focus:last-child,
-.linked.vertical > spinbutton + entry.error:focus:last-child,
-.linked.vertical > entry + spinbutton.error:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
-  border-top-color: #2b2e39; }
-
-.linked.vertical > entry + button, .linked.vertical > spinbutton + button,
-.linked.vertical > entry + button:hover,
-.linked.vertical > spinbutton + button:hover,
-.linked.vertical > entry + button:active,
-.linked.vertical > spinbutton + button:active,
-.linked.vertical > entry + button:checked,
-.linked.vertical > spinbutton + button:checked,
-.linked.vertical > entry + button:disabled,
-.linked.vertical > spinbutton + button:disabled {
-  border-top-style: solid; }
-
 .linked.vertical > entry:focus:not(:only-child) + entry, .linked.vertical > spinbutton:focus:not(:only-child) + entry, .linked.vertical > entry:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry:focus:not(:only-child) + button,
 .linked.vertical > spinbutton:focus:not(:only-child) + button,
@@ -648,6 +618,13 @@ button {
 .linked.vertical > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #2b2e39; }
 
+.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked.vertical > entry + entry.warning:focus:last-child,
+.linked.vertical > spinbutton + entry.warning:focus:last-child,
+.linked.vertical > entry + spinbutton.warning:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
+  border-top-color: #2b2e39; }
+
 .linked.vertical > entry.warning:focus:not(:only-child) + entry, .linked.vertical > spinbutton.warning:focus:not(:only-child) + entry, .linked.vertical > entry.warning:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.warning:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.warning:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + button,
@@ -655,6 +632,13 @@ button {
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #2b2e39; }
 
+.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked.vertical > entry + entry.error:focus:last-child,
+.linked.vertical > spinbutton + entry.error:focus:last-child,
+.linked.vertical > entry + spinbutton.error:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
+  border-top-color: #2b2e39; }
+
 .linked.vertical > entry.error:focus:not(:only-child) + entry, .linked.vertical > spinbutton.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.error:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.error:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.error:focus:not(:only-child) + button,
@@ -662,26 +646,28 @@ button {
 .linked.vertical > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #2b2e39; }
 
-.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
-.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: 0 -1px #2b2e39; }
-
-.linked.vertical > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
-
-.linked.vertical > button:checked + button:not(:checked):not(:active):hover {
-  box-shadow: none; }
-
 .linked.vertical > button:checked + entry, .linked.vertical > button:checked + spinbutton {
   border-top-color: #2b2e39; }
 
-.linked.vertical > entry + button:not(:checked):not(:active):hover, .linked.vertical > spinbutton + button:not(:checked):not(:active):hover {
+.linked.vertical > button + button {
+  border-top-style: none; }
+
+.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 0 1px #2b2e39; }
+
+.linked.vertical > button:first-child:hover:not(:checked):not(:active),
+.linked.vertical > button:checked + button:not(:checked):not(:active):hover,
+.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked.vertical > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
-toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
+toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, .linked:not(.vertical) > spinbutton,
+.linked:not(.vertical) > entry:focus,
+.linked:not(.vertical) > spinbutton:focus, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
 .linked:not(.vertical) > button:hover,
 .linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .linked:not(.vertical):not(.pathbar) > entry, .linked:not(.vertical):not(.pathbar) > spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
+.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
@@ -689,59 +675,41 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b
   border-radius: 0;
   border-right-style: none; }
 
-.inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 
-.inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
 
-.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > button,
+.linked.vertical > entry, .linked.vertical > spinbutton,
+.linked.vertical > entry:focus,
+.linked.vertical > spinbutton:focus, .linked.vertical > button,
 .linked.vertical > button:hover,
 .linked.vertical > button:active,
-.linked.vertical > button:checked, .linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > combobox > button.combo {
+.linked.vertical > button:checked, .linked.vertical > combobox > button.combo {
   border-radius: 0;
   border-bottom-style: none; }
 
-.linked.vertical > button:first-child, .linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
 
-.linked.vertical > button:last-child, .linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
 
-.linked.vertical > button:only-child, .linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
-.linked:not(.vertical) > button,
-.linked:not(.vertical) > button:hover,
-.linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:disabled {
-  border-left-style: none; }
-  .linked:not(.vertical) > button:first-child, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
-    border-left-style: solid; }
-
-.linked.vertical > button,
-.linked.vertical > button:hover,
-.linked.vertical > button:active,
-.linked.vertical > button:checked {
-  border-top-style: none; }
-  .linked.vertical > button:first-child {
-    border-top-style: solid; }
-
 menuitem.button.flat,
 modelbutton.flat, button:link, button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, menu arrow,
 .menu arrow, notebook header tab button, notebook header tab button:hover, notebook header tab button:active, notebook header tab button:active:hover, .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.flat:disabled, .app-notification button.sidebar-button:disabled, TerminalWindow .notebook tab:active button, TerminalWindow .notebook tab:hover button, TerminalWindow .notebook tab:active button:hover, TerminalWindow .notebook tab:hover button:hover, TerminalWindow .notebook tab:active button:active, TerminalWindow .notebook tab:hover button:active {
@@ -1156,43 +1124,49 @@ headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, he
   .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled {
     color: rgba(207, 218, 231, 0.4); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
   border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
   border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
   border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
+  border-left-color: rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
 .primary-toolbar button.suggested-action, headerbar button.suggested-action {
@@ -2869,28 +2843,28 @@ headerbar button.titlebutton,
     background-image: -gtk-scaled(url("assets/titlebutton-close-active-dark.png"), url("assets/titlebutton-close-active-dark@2.png")); }
   headerbar button.titlebutton.maximize,
   .titlebar button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-dark.png"), url("assets/titlebutton-max-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-dark.png"), url("assets/titlebutton-maximize-dark@2.png")); }
   headerbar button.titlebutton.maximize:backdrop,
   .titlebar button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop-dark.png"), url("assets/titlebutton-max-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop-dark.png"), url("assets/titlebutton-maximize-backdrop-dark@2.png")); }
   headerbar button.titlebutton.maximize:hover,
   .titlebar button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover-dark.png"), url("assets/titlebutton-max-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover-dark.png"), url("assets/titlebutton-maximize-hover-dark@2.png")); }
   headerbar button.titlebutton.maximize:active,
   .titlebar button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active-dark.png"), url("assets/titlebutton-max-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active-dark.png"), url("assets/titlebutton-maximize-active-dark@2.png")); }
   headerbar button.titlebutton.minimize,
   .titlebar button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-dark.png"), url("assets/titlebutton-min-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-dark.png"), url("assets/titlebutton-minimize-dark@2.png")); }
   headerbar button.titlebutton.minimize:backdrop,
   .titlebar button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop-dark.png"), url("assets/titlebutton-min-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop-dark.png"), url("assets/titlebutton-minimize-backdrop-dark@2.png")); }
   headerbar button.titlebutton.minimize:hover,
   .titlebar button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover-dark.png"), url("assets/titlebutton-min-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover-dark.png"), url("assets/titlebutton-minimize-hover-dark@2.png")); }
   headerbar button.titlebutton.minimize:active,
   .titlebar button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active-dark.png"), url("assets/titlebutton-min-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active-dark.png"), url("assets/titlebutton-minimize-active-dark@2.png")); }
 
 .view:selected,
 .view selection,
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 1840e95..575d2cd 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -348,6 +348,9 @@ button {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+    box-shadow: none; }
   button.suggested-action {
     background-clip: border-box;
     color: #ffffff;
@@ -490,95 +493,87 @@ button {
     .inline-toolbar toolbutton > button:disabled:active > label, .inline-toolbar toolbutton > button:disabled:checked > label {
       color: inherit; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry, .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.linked:not(.vertical):not(.path-bar) > entry + entry, .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(207, 214, 230, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.warning + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
   border-left-color: #F27835; }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
-  border-left-color: #F27835; }
-
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
-  border-left-color: #FC4138; }
-
-.linked:not(.vertical):not(.pathbar) > entry + button, .linked:not(.vertical):not(.pathbar) > spinbutton + button,
-.linked:not(.vertical):not(.pathbar) > entry + button:hover,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:hover,
-.linked:not(.vertical):not(.pathbar) > entry + button:active,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:active,
-.linked:not(.vertical):not(.pathbar) > entry + button:checked,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:checked,
-.linked:not(.vertical):not(.pathbar) > entry + button:disabled,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:disabled {
-  border-left-style: solid; }
-
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
+  border-left-color: #F27835; }
+
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #F27835; }
 
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active):not(:only-child),
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: -1px 0 #cfd6e6; }
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+  border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
+.linked:not(.vertical):not(.path-bar) > button:checked + entry, .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
+  border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + button:not(:checked):not(:active):hover {
-  box-shadow: none; }
+.linked:not(.vertical):not(.path-bar) > button + button {
+  border-left-style: none; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
-  border-left-color: #5294E2; }
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 1px 0 #cfd6e6; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
+.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active),
+.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover,
+.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked:not(.vertical):not(.path-bar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
+.linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
+
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
 
@@ -615,31 +610,6 @@ button {
 .linked.vertical > spinbutton + spinbutton:focus:last-child {
   border-top-color: #5294E2; }
 
-.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked.vertical > entry + entry.warning:focus:last-child,
-.linked.vertical > spinbutton + entry.warning:focus:last-child,
-.linked.vertical > entry + spinbutton.warning:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
-  border-top-color: #F27835; }
-
-.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked.vertical > entry + entry.error:focus:last-child,
-.linked.vertical > spinbutton + entry.error:focus:last-child,
-.linked.vertical > entry + spinbutton.error:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
-  border-top-color: #FC4138; }
-
-.linked.vertical > entry + button, .linked.vertical > spinbutton + button,
-.linked.vertical > entry + button:hover,
-.linked.vertical > spinbutton + button:hover,
-.linked.vertical > entry + button:active,
-.linked.vertical > spinbutton + button:active,
-.linked.vertical > entry + button:checked,
-.linked.vertical > spinbutton + button:checked,
-.linked.vertical > entry + button:disabled,
-.linked.vertical > spinbutton + button:disabled {
-  border-top-style: solid; }
-
 .linked.vertical > entry:focus:not(:only-child) + entry, .linked.vertical > spinbutton:focus:not(:only-child) + entry, .linked.vertical > entry:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry:focus:not(:only-child) + button,
 .linked.vertical > spinbutton:focus:not(:only-child) + button,
@@ -647,6 +617,13 @@ button {
 .linked.vertical > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #5294E2; }
 
+.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked.vertical > entry + entry.warning:focus:last-child,
+.linked.vertical > spinbutton + entry.warning:focus:last-child,
+.linked.vertical > entry + spinbutton.warning:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
+  border-top-color: #F27835; }
+
 .linked.vertical > entry.warning:focus:not(:only-child) + entry, .linked.vertical > spinbutton.warning:focus:not(:only-child) + entry, .linked.vertical > entry.warning:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.warning:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.warning:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + button,
@@ -654,6 +631,13 @@ button {
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #F27835; }
 
+.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked.vertical > entry + entry.error:focus:last-child,
+.linked.vertical > spinbutton + entry.error:focus:last-child,
+.linked.vertical > entry + spinbutton.error:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
+  border-top-color: #FC4138; }
+
 .linked.vertical > entry.error:focus:not(:only-child) + entry, .linked.vertical > spinbutton.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.error:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.error:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.error:focus:not(:only-child) + button,
@@ -661,26 +645,28 @@ button {
 .linked.vertical > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #FC4138; }
 
-.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
-.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: 0 -1px #cfd6e6; }
-
-.linked.vertical > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
-
-.linked.vertical > button:checked + button:not(:checked):not(:active):hover {
-  box-shadow: none; }
-
 .linked.vertical > button:checked + entry, .linked.vertical > button:checked + spinbutton {
   border-top-color: #5294E2; }
 
-.linked.vertical > entry + button:not(:checked):not(:active):hover, .linked.vertical > spinbutton + button:not(:checked):not(:active):hover {
+.linked.vertical > button + button {
+  border-top-style: none; }
+
+.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 0 1px #cfd6e6; }
+
+.linked.vertical > button:first-child:hover:not(:checked):not(:active),
+.linked.vertical > button:checked + button:not(:checked):not(:active):hover,
+.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked.vertical > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
-toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
+toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, .linked:not(.vertical) > spinbutton,
+.linked:not(.vertical) > entry:focus,
+.linked:not(.vertical) > spinbutton:focus, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
 .linked:not(.vertical) > button:hover,
 .linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .linked:not(.vertical):not(.pathbar) > entry, .linked:not(.vertical):not(.pathbar) > spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
+.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
@@ -688,59 +674,41 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b
   border-radius: 0;
   border-right-style: none; }
 
-.inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 
-.inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
 
-.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > button,
+.linked.vertical > entry, .linked.vertical > spinbutton,
+.linked.vertical > entry:focus,
+.linked.vertical > spinbutton:focus, .linked.vertical > button,
 .linked.vertical > button:hover,
 .linked.vertical > button:active,
-.linked.vertical > button:checked, .linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > combobox > button.combo {
+.linked.vertical > button:checked, .linked.vertical > combobox > button.combo {
   border-radius: 0;
   border-bottom-style: none; }
 
-.linked.vertical > button:first-child, .linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
 
-.linked.vertical > button:last-child, .linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
 
-.linked.vertical > button:only-child, .linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
-.linked:not(.vertical) > button,
-.linked:not(.vertical) > button:hover,
-.linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:disabled {
-  border-left-style: none; }
-  .linked:not(.vertical) > button:first-child, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
-    border-left-style: solid; }
-
-.linked.vertical > button,
-.linked.vertical > button:hover,
-.linked.vertical > button:active,
-.linked.vertical > button:checked {
-  border-top-style: none; }
-  .linked.vertical > button:first-child {
-    border-top-style: solid; }
-
 menuitem.button.flat,
 modelbutton.flat, button:link, button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, menu arrow,
 .menu arrow, notebook header tab button, notebook header tab button:hover, notebook header tab button:active, notebook header tab button:active:hover, .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.flat:disabled, .app-notification button.sidebar-button:disabled, TerminalWindow .notebook tab:active button, TerminalWindow .notebook tab:hover button, TerminalWindow .notebook tab:active button:hover, TerminalWindow .notebook tab:hover button:hover, TerminalWindow .notebook tab:active button:active, TerminalWindow .notebook tab:hover button:active {
@@ -1155,44 +1123,50 @@ headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, he
   .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled {
     color: rgba(207, 218, 231, 0.4); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4), inset -1px 0 rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
-  border-left-color: #FC4138; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
+  border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
-  border-left-color: #F27835; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
+  border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
-  border-left-color: #FC4138; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
+  border-left-color: rgba(21, 23, 28, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
-  border-left-color: #F27835; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+  border-left-color: rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
-  border-left-color: #FC4138; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
+  border-left-color: rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-left-color: rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
-  border-left-color: #F27835; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
+  border-left-color: rgba(21, 23, 28, 0.4); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo {
-  border-left-color: #FC4138; }
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+  border-left-color: rgba(21, 23, 28, 0.4); }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
+  border-left-color: rgba(21, 23, 28, 0.4); }
 
 .primary-toolbar button.suggested-action, headerbar button.suggested-action {
   background-clip: border-box;
@@ -2868,28 +2842,28 @@ headerbar button.titlebutton,
     background-image: -gtk-scaled(url("assets/titlebutton-close-active-dark.png"), url("assets/titlebutton-close-active-dark@2.png")); }
   headerbar button.titlebutton.maximize,
   .titlebar button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-dark.png"), url("assets/titlebutton-max-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-dark.png"), url("assets/titlebutton-maximize-dark@2.png")); }
   headerbar button.titlebutton.maximize:backdrop,
   .titlebar button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop-dark.png"), url("assets/titlebutton-max-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop-dark.png"), url("assets/titlebutton-maximize-backdrop-dark@2.png")); }
   headerbar button.titlebutton.maximize:hover,
   .titlebar button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover-dark.png"), url("assets/titlebutton-max-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover-dark.png"), url("assets/titlebutton-maximize-hover-dark@2.png")); }
   headerbar button.titlebutton.maximize:active,
   .titlebar button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active-dark.png"), url("assets/titlebutton-max-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active-dark.png"), url("assets/titlebutton-maximize-active-dark@2.png")); }
   headerbar button.titlebutton.minimize,
   .titlebar button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-dark.png"), url("assets/titlebutton-min-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-dark.png"), url("assets/titlebutton-minimize-dark@2.png")); }
   headerbar button.titlebutton.minimize:backdrop,
   .titlebar button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop-dark.png"), url("assets/titlebutton-min-backdrop-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop-dark.png"), url("assets/titlebutton-minimize-backdrop-dark@2.png")); }
   headerbar button.titlebutton.minimize:hover,
   .titlebar button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover-dark.png"), url("assets/titlebutton-min-hover-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover-dark.png"), url("assets/titlebutton-minimize-hover-dark@2.png")); }
   headerbar button.titlebutton.minimize:active,
   .titlebar button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active-dark.png"), url("assets/titlebutton-min-active-dark@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active-dark.png"), url("assets/titlebutton-minimize-active-dark@2.png")); }
 
 .view:selected,
 .view selection,
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index dcc1942..af66efa 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -348,6 +348,9 @@ button {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: rgba(26, 28, 34, 0.4);
         background-color: #5294E2; }
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+    box-shadow: none; }
   button.suggested-action {
     background-clip: border-box;
     color: #ffffff;
@@ -490,95 +493,87 @@ button {
     .inline-toolbar toolbutton > button:disabled:active > label, .inline-toolbar toolbutton > button:disabled:checked > label {
       color: inherit; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry, .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.linked:not(.vertical):not(.path-bar) > entry + entry, .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(207, 214, 230, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.warning + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
   border-left-color: #F27835; }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
-  border-left-color: #F27835; }
-
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
-  border-left-color: #FC4138; }
-
-.linked:not(.vertical):not(.pathbar) > entry + button, .linked:not(.vertical):not(.pathbar) > spinbutton + button,
-.linked:not(.vertical):not(.pathbar) > entry + button:hover,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:hover,
-.linked:not(.vertical):not(.pathbar) > entry + button:active,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:active,
-.linked:not(.vertical):not(.pathbar) > entry + button:checked,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:checked,
-.linked:not(.vertical):not(.pathbar) > entry + button:disabled,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:disabled {
-  border-left-style: solid; }
-
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
+  border-left-color: #F27835; }
+
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #F27835; }
 
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active):not(:only-child),
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: -1px 0 #cfd6e6; }
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+  border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
+.linked:not(.vertical):not(.path-bar) > button:checked + entry, .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
+  border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + button:not(:checked):not(:active):hover {
-  box-shadow: none; }
+.linked:not(.vertical):not(.path-bar) > button + button {
+  border-left-style: none; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
-  border-left-color: #5294E2; }
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 1px 0 #cfd6e6; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
+.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active),
+.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover,
+.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked:not(.vertical):not(.path-bar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
+.linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
+
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
 
@@ -615,31 +610,6 @@ button {
 .linked.vertical > spinbutton + spinbutton:focus:last-child {
   border-top-color: #5294E2; }
 
-.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked.vertical > entry + entry.warning:focus:last-child,
-.linked.vertical > spinbutton + entry.warning:focus:last-child,
-.linked.vertical > entry + spinbutton.warning:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
-  border-top-color: #F27835; }
-
-.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked.vertical > entry + entry.error:focus:last-child,
-.linked.vertical > spinbutton + entry.error:focus:last-child,
-.linked.vertical > entry + spinbutton.error:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
-  border-top-color: #FC4138; }
-
-.linked.vertical > entry + button, .linked.vertical > spinbutton + button,
-.linked.vertical > entry + button:hover,
-.linked.vertical > spinbutton + button:hover,
-.linked.vertical > entry + button:active,
-.linked.vertical > spinbutton + button:active,
-.linked.vertical > entry + button:checked,
-.linked.vertical > spinbutton + button:checked,
-.linked.vertical > entry + button:disabled,
-.linked.vertical > spinbutton + button:disabled {
-  border-top-style: solid; }
-
 .linked.vertical > entry:focus:not(:only-child) + entry, .linked.vertical > spinbutton:focus:not(:only-child) + entry, .linked.vertical > entry:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry:focus:not(:only-child) + button,
 .linked.vertical > spinbutton:focus:not(:only-child) + button,
@@ -647,6 +617,13 @@ button {
 .linked.vertical > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #5294E2; }
 
+.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked.vertical > entry + entry.warning:focus:last-child,
+.linked.vertical > spinbutton + entry.warning:focus:last-child,
+.linked.vertical > entry + spinbutton.warning:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
+  border-top-color: #F27835; }
+
 .linked.vertical > entry.warning:focus:not(:only-child) + entry, .linked.vertical > spinbutton.warning:focus:not(:only-child) + entry, .linked.vertical > entry.warning:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.warning:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.warning:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + button,
@@ -654,6 +631,13 @@ button {
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #F27835; }
 
+.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked.vertical > entry + entry.error:focus:last-child,
+.linked.vertical > spinbutton + entry.error:focus:last-child,
+.linked.vertical > entry + spinbutton.error:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
+  border-top-color: #FC4138; }
+
 .linked.vertical > entry.error:focus:not(:only-child) + entry, .linked.vertical > spinbutton.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.error:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.error:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.error:focus:not(:only-child) + button,
@@ -661,26 +645,28 @@ button {
 .linked.vertical > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #FC4138; }
 
-.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
-.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: 0 -1px #cfd6e6; }
-
-.linked.vertical > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
-
-.linked.vertical > button:checked + button:not(:checked):not(:active):hover {
-  box-shadow: none; }
-
 .linked.vertical > button:checked + entry, .linked.vertical > button:checked + spinbutton {
   border-top-color: #5294E2; }
 
-.linked.vertical > entry + button:not(:checked):not(:active):hover, .linked.vertical > spinbutton + button:not(:checked):not(:active):hover {
+.linked.vertical > button + button {
+  border-top-style: none; }
+
+.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 0 1px #cfd6e6; }
+
+.linked.vertical > button:first-child:hover:not(:checked):not(:active),
+.linked.vertical > button:checked + button:not(:checked):not(:active):hover,
+.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked.vertical > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
-toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
+toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, .linked:not(.vertical) > spinbutton,
+.linked:not(.vertical) > entry:focus,
+.linked:not(.vertical) > spinbutton:focus, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
 .linked:not(.vertical) > button:hover,
 .linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .linked:not(.vertical):not(.pathbar) > entry, .linked:not(.vertical):not(.pathbar) > spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
+.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
@@ -688,59 +674,41 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b
   border-radius: 0;
   border-right-style: none; }
 
-.inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 
-.inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
 
-.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > button,
+.linked.vertical > entry, .linked.vertical > spinbutton,
+.linked.vertical > entry:focus,
+.linked.vertical > spinbutton:focus, .linked.vertical > button,
 .linked.vertical > button:hover,
 .linked.vertical > button:active,
-.linked.vertical > button:checked, .linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > combobox > button.combo {
+.linked.vertical > button:checked, .linked.vertical > combobox > button.combo {
   border-radius: 0;
   border-bottom-style: none; }
 
-.linked.vertical > button:first-child, .linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
 
-.linked.vertical > button:last-child, .linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
 
-.linked.vertical > button:only-child, .linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
-.linked:not(.vertical) > button,
-.linked:not(.vertical) > button:hover,
-.linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:disabled {
-  border-left-style: none; }
-  .linked:not(.vertical) > button:first-child, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
-    border-left-style: solid; }
-
-.linked.vertical > button,
-.linked.vertical > button:hover,
-.linked.vertical > button:active,
-.linked.vertical > button:checked {
-  border-top-style: none; }
-  .linked.vertical > button:first-child {
-    border-top-style: solid; }
-
 menuitem.button.flat,
 modelbutton.flat, button:link, button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, menu arrow,
 .menu arrow, notebook header tab button, notebook header tab button:hover, notebook header tab button:active, notebook header tab button:active:hover, .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.flat:disabled, .app-notification button.sidebar-button:disabled, TerminalWindow .notebook tab:active button, TerminalWindow .notebook tab:hover button, TerminalWindow .notebook tab:active button:hover, TerminalWindow .notebook tab:hover button:hover, TerminalWindow .notebook tab:active button:active, TerminalWindow .notebook tab:hover button:active {
@@ -1155,45 +1123,51 @@ headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, he
   .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled {
     color: rgba(82, 93, 118, 0.4); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(82, 93, 118, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
   border-left-color: #FC4138; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
   border-left-color: #F27835; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
   border-left-color: #FC4138; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
   border-left-color: #5294E2; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
-  border-left-color: #F27835; }
-
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
-  border-left-color: #FC4138; }
-
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #5294E2; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
+  border-left-color: #F27835; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #F27835; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
+  border-left-color: #FC4138; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #FC4138; }
 
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
+  border-left-color: #5294E2; }
+
 .primary-toolbar button.suggested-action, headerbar button.suggested-action {
   background-clip: border-box;
   color: #ffffff;
@@ -2872,28 +2846,28 @@ headerbar button.titlebutton,
     background-image: -gtk-scaled(url("assets/titlebutton-close-active.png"), url("assets/titlebutton-close-active@2.png")); }
   headerbar button.titlebutton.maximize,
   .titlebar button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max.png"), url("assets/titlebutton-max@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize.png"), url("assets/titlebutton-maximize@2.png")); }
   headerbar button.titlebutton.maximize:backdrop,
   .titlebar button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop.png"), url("assets/titlebutton-max-backdrop@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop.png"), url("assets/titlebutton-maximize-backdrop@2.png")); }
   headerbar button.titlebutton.maximize:hover,
   .titlebar button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover.png"), url("assets/titlebutton-max-hover@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover.png"), url("assets/titlebutton-maximize-hover@2.png")); }
   headerbar button.titlebutton.maximize:active,
   .titlebar button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active.png"), url("assets/titlebutton-max-active@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active.png"), url("assets/titlebutton-maximize-active@2.png")); }
   headerbar button.titlebutton.minimize,
   .titlebar button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min.png"), url("assets/titlebutton-min@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize.png"), url("assets/titlebutton-minimize@2.png")); }
   headerbar button.titlebutton.minimize:backdrop,
   .titlebar button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop.png"), url("assets/titlebutton-min-backdrop@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop.png"), url("assets/titlebutton-minimize-backdrop@2.png")); }
   headerbar button.titlebutton.minimize:hover,
   .titlebar button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover.png"), url("assets/titlebutton-min-hover@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover.png"), url("assets/titlebutton-minimize-hover@2.png")); }
   headerbar button.titlebutton.minimize:active,
   .titlebar button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active.png"), url("assets/titlebutton-min-active@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active.png"), url("assets/titlebutton-minimize-active@2.png")); }
 
 .view:selected,
 .view selection,
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 6ee2d6d..837126d 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -348,6 +348,9 @@ button {
         outline-color: rgba(255, 255, 255, 0.3);
         border-color: rgba(26, 28, 34, 0.35);
         background-color: #5294E2; }
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+  .osd .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+    box-shadow: none; }
   button.suggested-action {
     background-clip: border-box;
     color: #ffffff;
@@ -490,95 +493,87 @@ button {
     .inline-toolbar toolbutton > button:disabled:active > label, .inline-toolbar toolbutton > button:disabled:checked > label {
       color: inherit; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry, .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.linked:not(.vertical):not(.path-bar) > entry + entry, .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(207, 214, 230, 0.3); }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.warning + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
   border-left-color: #F27835; }
 
-.linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
+.linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
-  border-left-color: #F27835; }
-
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child,
-.linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
-  border-left-color: #FC4138; }
-
-.linked:not(.vertical):not(.pathbar) > entry + button, .linked:not(.vertical):not(.pathbar) > spinbutton + button,
-.linked:not(.vertical):not(.pathbar) > entry + button:hover,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:hover,
-.linked:not(.vertical):not(.pathbar) > entry + button:active,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:active,
-.linked:not(.vertical):not(.pathbar) > entry + button:checked,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:checked,
-.linked:not(.vertical):not(.pathbar) > entry + button:disabled,
-.linked:not(.vertical):not(.pathbar) > spinbutton + button:disabled {
-  border-left-style: solid; }
-
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
+  border-left-color: #F27835; }
+
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #F27835; }
 
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button,
-.linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + combobox > button.combo,
-.linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child,
+.linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
   border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active):not(:only-child),
-.linked:not(.vertical):not(.pathbar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: -1px 0 #cfd6e6; }
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button,
+.linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo,
+.linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
+  border-left-color: #FC4138; }
 
-.linked:not(.vertical):not(.pathbar) > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
+.linked:not(.vertical):not(.path-bar) > button:checked + entry, .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
+  border-left-color: #5294E2; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + button:not(:checked):not(:active):hover {
-  box-shadow: none; }
+.linked:not(.vertical):not(.path-bar) > button + button {
+  border-left-style: none; }
 
-.linked:not(.vertical):not(.pathbar) > button:checked + entry, .linked:not(.vertical):not(.pathbar) > button:checked + spinbutton {
-  border-left-color: #5294E2; }
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
+.linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 1px 0 #cfd6e6; }
 
-.linked:not(.vertical):not(.pathbar) > entry + button:not(:checked):not(:active):not(:only-child):hover, .linked:not(.vertical):not(.pathbar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
+.linked:not(.vertical):not(.path-bar) > button:first-child:hover:not(:checked):not(:active),
+.linked:not(.vertical):not(.path-bar) > button:checked + button:not(:checked):not(:active):hover,
+.linked:not(.vertical):not(.path-bar) > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked:not(.vertical):not(.path-bar) > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
+.linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
+
 .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(207, 214, 230, 0.4), inset -1px 0 rgba(207, 214, 230, 0.4); }
 
@@ -615,31 +610,6 @@ button {
 .linked.vertical > spinbutton + spinbutton:focus:last-child {
   border-top-color: #5294E2; }
 
-.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
-.linked.vertical > entry + entry.warning:focus:last-child,
-.linked.vertical > spinbutton + entry.warning:focus:last-child,
-.linked.vertical > entry + spinbutton.warning:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
-  border-top-color: #F27835; }
-
-.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
-.linked.vertical > entry + entry.error:focus:last-child,
-.linked.vertical > spinbutton + entry.error:focus:last-child,
-.linked.vertical > entry + spinbutton.error:focus:last-child,
-.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
-  border-top-color: #FC4138; }
-
-.linked.vertical > entry + button, .linked.vertical > spinbutton + button,
-.linked.vertical > entry + button:hover,
-.linked.vertical > spinbutton + button:hover,
-.linked.vertical > entry + button:active,
-.linked.vertical > spinbutton + button:active,
-.linked.vertical > entry + button:checked,
-.linked.vertical > spinbutton + button:checked,
-.linked.vertical > entry + button:disabled,
-.linked.vertical > spinbutton + button:disabled {
-  border-top-style: solid; }
-
 .linked.vertical > entry:focus:not(:only-child) + entry, .linked.vertical > spinbutton:focus:not(:only-child) + entry, .linked.vertical > entry:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry:focus:not(:only-child) + button,
 .linked.vertical > spinbutton:focus:not(:only-child) + button,
@@ -647,6 +617,13 @@ button {
 .linked.vertical > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #5294E2; }
 
+.linked.vertical > entry + entry.warning:focus:not(:last-child), .linked.vertical > spinbutton + entry.warning:focus:not(:last-child), .linked.vertical > entry + spinbutton.warning:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.warning:focus:not(:last-child),
+.linked.vertical > entry + entry.warning:focus:last-child,
+.linked.vertical > spinbutton + entry.warning:focus:last-child,
+.linked.vertical > entry + spinbutton.warning:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.warning:focus:last-child {
+  border-top-color: #F27835; }
+
 .linked.vertical > entry.warning:focus:not(:only-child) + entry, .linked.vertical > spinbutton.warning:focus:not(:only-child) + entry, .linked.vertical > entry.warning:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.warning:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.warning:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + button,
@@ -654,6 +631,13 @@ button {
 .linked.vertical > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #F27835; }
 
+.linked.vertical > entry + entry.error:focus:not(:last-child), .linked.vertical > spinbutton + entry.error:focus:not(:last-child), .linked.vertical > entry + spinbutton.error:focus:not(:last-child), .linked.vertical > spinbutton + spinbutton.error:focus:not(:last-child),
+.linked.vertical > entry + entry.error:focus:last-child,
+.linked.vertical > spinbutton + entry.error:focus:last-child,
+.linked.vertical > entry + spinbutton.error:focus:last-child,
+.linked.vertical > spinbutton + spinbutton.error:focus:last-child {
+  border-top-color: #FC4138; }
+
 .linked.vertical > entry.error:focus:not(:only-child) + entry, .linked.vertical > spinbutton.error:focus:not(:only-child) + entry, .linked.vertical > entry.error:focus:not(:only-child) + spinbutton, .linked.vertical > spinbutton.error:focus:not(:only-child) + spinbutton,
 .linked.vertical > entry.error:focus:not(:only-child) + button,
 .linked.vertical > spinbutton.error:focus:not(:only-child) + button,
@@ -661,26 +645,28 @@ button {
 .linked.vertical > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-top-color: #FC4138; }
 
-.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
-.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
-  box-shadow: 0 -1px #cfd6e6; }
-
-.linked.vertical > button:first-child:hover:not(:checked):not(:active) {
-  box-shadow: none; }
-
-.linked.vertical > button:checked + button:not(:checked):not(:active):hover {
-  box-shadow: none; }
-
 .linked.vertical > button:checked + entry, .linked.vertical > button:checked + spinbutton {
   border-top-color: #5294E2; }
 
-.linked.vertical > entry + button:not(:checked):not(:active):hover, .linked.vertical > spinbutton + button:not(:checked):not(:active):hover {
+.linked.vertical > button + button {
+  border-top-style: none; }
+
+.linked.vertical > button:hover:not(:checked):not(:active):not(:only-child),
+.linked.vertical > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) {
+  box-shadow: inset 0 1px #cfd6e6; }
+
+.linked.vertical > button:first-child:hover:not(:checked):not(:active),
+.linked.vertical > button:checked + button:not(:checked):not(:active):hover,
+.linked.vertical > entry + button:not(:checked):not(:active):not(:only-child):hover,
+.linked.vertical > spinbutton + button:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: none; }
 
-toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
+toolbar.inline-toolbar toolbutton > button.flat, .inline-toolbar toolbutton > button.flat, toolbar.inline-toolbar toolbutton > button.sidebar-button, .inline-toolbar toolbutton > button.sidebar-button, .linked:not(.vertical) > entry, .linked:not(.vertical) > spinbutton,
+.linked:not(.vertical) > entry:focus,
+.linked:not(.vertical) > spinbutton:focus, .inline-toolbar button, .inline-toolbar button:backdrop, .linked:not(.vertical) > button,
 .linked:not(.vertical) > button:hover,
 .linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .linked:not(.vertical):not(.pathbar) > entry, .linked:not(.vertical):not(.pathbar) > spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
+.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
 NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
@@ -688,59 +674,41 @@ NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > b
   border-radius: 0;
   border-right-style: none; }
 
-.inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:first-child, .linked:not(.vertical):not(.pathbar) > spinbutton:first-child, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
+.linked:not(.vertical) > entry:first-child, .linked:not(.vertical) > spinbutton:first-child, .inline-toolbar button:first-child, .linked:not(.vertical) > button:first-child, toolbar.inline-toolbar toolbutton:first-child > button.flat, .inline-toolbar toolbutton:first-child > button.flat, toolbar.inline-toolbar toolbutton:first-child > button.sidebar-button, .inline-toolbar toolbutton:first-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(rtl), .linked:not(.vertical) > combobox:first-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
   border-top-left-radius: 3px;
   border-bottom-left-radius: 3px; }
 
-.inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:last-child, .linked:not(.vertical):not(.pathbar) > spinbutton:last-child, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
+.linked:not(.vertical) > entry:last-child, .linked:not(.vertical) > spinbutton:last-child, .inline-toolbar button:last-child, .linked:not(.vertical) > button:last-child, toolbar.inline-toolbar toolbutton:last-child > button.flat, .inline-toolbar toolbutton:last-child > button.flat, toolbar.inline-toolbar toolbutton:last-child > button.sidebar-button, .inline-toolbar toolbutton:last-child > button.sidebar-button, combobox.linked button:nth-child(2):dir(ltr), .linked:not(.vertical) > combobox:last-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:last-child, .primary-toolbar .linked:not(.vertical).path-bar > button:last-child, headerbar .linked:not(.vertical).path-bar > button:last-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:last-child {
   border-top-right-radius: 3px;
   border-bottom-right-radius: 3px;
   border-right-style: solid; }
 
-.inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical):not(.pathbar) > entry:only-child, .linked:not(.vertical):not(.pathbar) > spinbutton:only-child, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
+.linked:not(.vertical) > entry:only-child, .linked:not(.vertical) > spinbutton:only-child, .inline-toolbar button:only-child, .linked:not(.vertical) > button:only-child, toolbar.inline-toolbar toolbutton:only-child > button.flat, .inline-toolbar toolbutton:only-child > button.flat, toolbar.inline-toolbar toolbutton:only-child > button.sidebar-button, .inline-toolbar toolbutton:only-child > button.sidebar-button, .linked:not(.vertical) > combobox:only-child > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:only-child, .primary-toolbar .linked:not(.vertical).path-bar > button:only-child, headerbar .linked:not(.vertical).path-bar > button:only-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:only-child {
   border-radius: 3px;
   border-style: solid; }
 
-.linked.vertical > button,
+.linked.vertical > entry, .linked.vertical > spinbutton,
+.linked.vertical > entry:focus,
+.linked.vertical > spinbutton:focus, .linked.vertical > button,
 .linked.vertical > button:hover,
 .linked.vertical > button:active,
-.linked.vertical > button:checked, .linked.vertical > entry, .linked.vertical > spinbutton, .linked.vertical > combobox > button.combo {
+.linked.vertical > button:checked, .linked.vertical > combobox > button.combo {
   border-radius: 0;
   border-bottom-style: none; }
 
-.linked.vertical > button:first-child, .linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > combobox:first-child > button.combo {
+.linked.vertical > entry:first-child, .linked.vertical > spinbutton:first-child, .linked.vertical > button:first-child, .linked.vertical > combobox:first-child > button.combo {
   border-top-left-radius: 3px;
   border-top-right-radius: 3px; }
 
-.linked.vertical > button:last-child, .linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > combobox:last-child > button.combo {
+.linked.vertical > entry:last-child, .linked.vertical > spinbutton:last-child, .linked.vertical > button:last-child, .linked.vertical > combobox:last-child > button.combo {
   border-bottom-left-radius: 3px;
   border-bottom-right-radius: 3px;
   border-bottom-style: solid; }
 
-.linked.vertical > button:only-child, .linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > combobox:only-child > button.combo {
+.linked.vertical > entry:only-child, .linked.vertical > spinbutton:only-child, .linked.vertical > button:only-child, .linked.vertical > combobox:only-child > button.combo {
   border-radius: 3px;
   border-style: solid; }
 
-.linked:not(.vertical) > button,
-.linked:not(.vertical) > button:hover,
-.linked:not(.vertical) > button:active,
-.linked:not(.vertical) > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button, .primary-toolbar .linked:not(.vertical).path-bar > button, headerbar .linked:not(.vertical).path-bar > button, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover, headerbar .linked:not(.vertical).path-bar > button:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:active, .primary-toolbar .linked:not(.vertical).path-bar > button:active, headerbar .linked:not(.vertical).path-bar > button:active, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked, .primary-toolbar .linked:not(.vertical).path-bar > button:checked, headerbar .linked:not(.vertical).path-bar > button:checked, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:hover,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:active,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:checked,
-NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:disabled {
-  border-left-style: none; }
-  .linked:not(.vertical) > button:first-child, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:first-child, .primary-toolbar .linked:not(.vertical).path-bar > button:first-child, headerbar .linked:not(.vertical).path-bar > button:first-child, NemoWindow .primary-toolbar NemoPathBar.linked:not(.vertical):not(.path-bar) > button:first-child {
-    border-left-style: solid; }
-
-.linked.vertical > button,
-.linked.vertical > button:hover,
-.linked.vertical > button:active,
-.linked.vertical > button:checked {
-  border-top-style: none; }
-  .linked.vertical > button:first-child {
-    border-top-style: solid; }
-
 menuitem.button.flat,
 modelbutton.flat, button:link, button:visited, button:link:hover, button:link:active, button:link:checked, button:visited:hover, button:visited:active, button:visited:checked, menu arrow,
 .menu arrow, notebook header tab button, notebook header tab button:hover, notebook header tab button:active, notebook header tab button:active:hover, .app-notification button.flat, .app-notification button.sidebar-button, .app-notification button.flat:disabled, .app-notification button.sidebar-button:disabled, TerminalWindow .notebook tab:active button, TerminalWindow .notebook tab:hover button, TerminalWindow .notebook tab:active button:hover, TerminalWindow .notebook tab:hover button:hover, TerminalWindow .notebook tab:active button:active, TerminalWindow .notebook tab:hover button:active {
@@ -1155,45 +1123,51 @@ headerbar entry, headerbar spinbutton, headerbar button, headerbar separator, he
   .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled, .primary-toolbar .linked:not(.vertical).path-bar > button:disabled, headerbar .linked:not(.vertical).path-bar > button:disabled {
     color: rgba(82, 93, 118, 0.4); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button + button, .primary-toolbar .linked:not(.vertical).path-bar > button + button, headerbar .linked:not(.vertical).path-bar > button + button {
+  border-left-style: none; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):hover {
   box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1), inset -1px 0 rgba(82, 93, 118, 0.1); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):first-child:hover {
   box-shadow: inset -1px 0 rgba(82, 93, 118, 0.1); }
 
-.primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
+.primary-toolbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, .primary-toolbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover, headerbar .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child):last-child:hover {
   box-shadow: inset 1px 0 rgba(82, 93, 118, 0.1); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton {
   border-left-color: rgba(82, 93, 118, 0); }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error {
   border-left-color: #FC4138; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning {
   border-left-color: #F27835; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error + spinbutton.warning {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + entry.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > entry.error + spinbutton.warning, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error + spinbutton.warning {
   border-left-color: #FC4138; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton:focus:last-child {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton:focus:last-child {
   border-left-color: #5294E2; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.warning:focus:last-child {
-  border-left-color: #F27835; }
-
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton + spinbutton.error:focus:last-child {
-  border-left-color: #FC4138; }
-
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #5294E2; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.warning:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.warning:focus:last-child {
+  border-left-color: #F27835; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.warning:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.warning:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #F27835; }
 
-.primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > entry.error:focus:not(:only-child) + button.combo > button.combo, .primary-toolbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo, headerbar .linked:not(.vertical):not(.pathbar) > spinbutton.error:focus:not(:only-child) + button.combo > button.combo {
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:not(:last-child), .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + entry.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > entry + spinbutton.error:focus:last-child, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton + spinbutton.error:focus:last-child {
+  border-left-color: #FC4138; }
+
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + spinbutton, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + button, .primary-toolbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > entry.error:focus:not(:only-child) + combobox > button.combo, .primary-toolbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo, headerbar .linked:not(.vertical):not(.path-bar) > spinbutton.error:focus:not(:only-child) + combobox > button.combo {
   border-left-color: #FC4138; }
 
+.primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + entry, .primary-toolbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton, headerbar .linked:not(.vertical):not(.path-bar) > button:checked + spinbutton {
+  border-left-color: #5294E2; }
+
 .primary-toolbar button.suggested-action, headerbar button.suggested-action {
   background-clip: border-box;
   color: #ffffff;
@@ -2872,28 +2846,28 @@ headerbar button.titlebutton,
     background-image: -gtk-scaled(url("assets/titlebutton-close-active.png"), url("assets/titlebutton-close-active@2.png")); }
   headerbar button.titlebutton.maximize,
   .titlebar button.titlebutton.maximize {
-    background-image: -gtk-scaled(url("assets/titlebutton-max.png"), url("assets/titlebutton-max@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize.png"), url("assets/titlebutton-maximize@2.png")); }
   headerbar button.titlebutton.maximize:backdrop,
   .titlebar button.titlebutton.maximize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-backdrop.png"), url("assets/titlebutton-max-backdrop@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-backdrop.png"), url("assets/titlebutton-maximize-backdrop@2.png")); }
   headerbar button.titlebutton.maximize:hover,
   .titlebar button.titlebutton.maximize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-hover.png"), url("assets/titlebutton-max-hover@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-hover.png"), url("assets/titlebutton-maximize-hover@2.png")); }
   headerbar button.titlebutton.maximize:active,
   .titlebar button.titlebutton.maximize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-max-active.png"), url("assets/titlebutton-max-active@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-maximize-active.png"), url("assets/titlebutton-maximize-active@2.png")); }
   headerbar button.titlebutton.minimize,
   .titlebar button.titlebutton.minimize {
-    background-image: -gtk-scaled(url("assets/titlebutton-min.png"), url("assets/titlebutton-min@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize.png"), url("assets/titlebutton-minimize@2.png")); }
   headerbar button.titlebutton.minimize:backdrop,
   .titlebar button.titlebutton.minimize:backdrop {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-backdrop.png"), url("assets/titlebutton-min-backdrop@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-backdrop.png"), url("assets/titlebutton-minimize-backdrop@2.png")); }
   headerbar button.titlebutton.minimize:hover,
   .titlebar button.titlebutton.minimize:hover {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-hover.png"), url("assets/titlebutton-min-hover@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-hover.png"), url("assets/titlebutton-minimize-hover@2.png")); }
   headerbar button.titlebutton.minimize:active,
   .titlebar button.titlebutton.minimize:active {
-    background-image: -gtk-scaled(url("assets/titlebutton-min-active.png"), url("assets/titlebutton-min-active@2.png")); }
+    background-image: -gtk-scaled(url("assets/titlebutton-minimize-active.png"), url("assets/titlebutton-minimize-active@2.png")); }
 
 .view:selected,
 .view selection,
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 393f206..05b7bf9 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -271,6 +271,12 @@ entry {
     &:focus { @include entry(osd-focus); }
     &:disabled { @include entry(osd-insensitive); }
   }
+
+  .linked:not(.vertical) > &,
+  .linked:not(.vertical) > &:focus { @extend %linked; }
+
+  .linked.vertical > &,
+  .linked.vertical > &:focus { @extend %linked_vertical; }
 }
 
 //
@@ -388,6 +394,9 @@ button {
       &:active, &:checked { @include button(osd-active); }
     }
   }
+  .osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active):not(:only-child),
+  .osd .linked:not(.vertical):not(.path-bar) > &:hover:not(:checked):not(:active) + &:not(:checked):not(:active) { box-shadow: none; }
+
   // Suggested and Destructive Action buttons
   @each $b_type, $b_color in (suggested-action, $suggested_color),
                              (destructive-action, $destructive_color) {
@@ -493,7 +502,6 @@ button {
   .linked:not(.vertical) > &:active,
   .linked:not(.vertical) > &:checked {
     @extend %linked;
-    @extend %linked_button;
   }
 
   .linked.vertical > &,
@@ -501,7 +509,6 @@ button {
   .linked.vertical > &:active,
   .linked.vertical > &:checked {
     @extend %linked_vertical;
-    @extend %linked_vertical_button;
   }
 }
 
@@ -527,131 +534,73 @@ toolbar.inline-toolbar toolbutton {
 }
 
 // Some crazy linking stuff
+@mixin linking_rules($a:0.7, $var:$variant, $vert:'false', $entry_rules:'true', $button_rules:'true',
+                     $e_border:$entry_border, $b_border:$button_border) {
 
-// horizontal
-.linked:not(.vertical):not(.pathbar) {
-  > entry { @extend %linked; }
-
-
-  > entry + entry { border-left-color: transparentize($entry_border, 0.7); }
-
-  > entry.error + entry,
-  > entry + entry.error { border-left-color: if($variant=='light', $error_color, transparentize($entry_border, 0.7)); }
-
-  > entry.warning + entry,
-  > entry + entry.warning { border-left-color: if($variant=='light', $warning_color, transparentize($entry_border, 0.7)); }
-
-  > entry.error + entry.warning { border-left-color: if($variant=='light', $error_color, transparentize($entry_border, 0.7));}
+  $_border: if($vert=='false', left, top);
 
+  @if $entry_rules=='true' {
+    > entry + entry { border-#{$_border}-color: transparentize($e_border, $a); }
 
-  > entry + entry:focus:not(:last-child),
-  > entry + entry:focus:last-child { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
-
-  > entry + entry.warning:focus:not(:last-child),
-  > entry + entry.warning:focus:last-child { border-left-color: if($variant=='light', $warning_color, $entry_border); }
-
-  > entry + entry.error:focus:not(:last-child),
-  > entry + entry.error:focus:last-child { border-left-color: if($variant=='light', $error_color, $entry_border); }
-
+    > entry.error + entry,
+    > entry + entry.error { border-#{$_border}-color: if($var=='light', $error_color, transparentize($e_border, $a)); }
 
-  > entry + button,
-  > entry + button:hover,
-  > entry + button:active,
-  > entry + button:checked,
-  > entry + button:disabled { border-left-style: solid; }
+    > entry.warning + entry,
+    > entry + entry.warning { border-#{$_border}-color: if($var=='light', $warning_color, transparentize($e_border, $a)); }
 
+    > entry.error + entry.warning { border-#{$_border}-color: if($var=='light', $error_color, transparentize($e_border, $a));}
 
-  > entry:focus:not(:only-child) + entry,
-  > entry:focus:not(:only-child) + button,
-  > entry:focus:not(:only-child) + combobox > button.combo { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
+    @each $e_type, $e_color in ('',$selected_bg_color),
+                               ('.warning', $warning_color),
+                               ('.error', $error_color) {
 
-  > entry.warning:focus:not(:only-child) + entry,
-  > entry.warning:focus:not(:only-child) + button,
-  > entry.warning:focus:not(:only-child) + combobox > button.combo { border-left-color: if($variant=='light', $warning_color, $entry_border); }
+      > entry + entry#{$e_type}:focus:not(:last-child),
+      > entry + entry#{$e_type}:focus:last-child { border-#{$_border}-color: if($var=='light', $e_color, $e_border); }
 
-  > entry.error:focus:not(:only-child) + entry,
-  > entry.error:focus:not(:only-child) + button,
-  > entry.error:focus:not(:only-child) + combobox > button.combo { border-left-color: if($variant=='light', $error_color, $entry_border); }
+      > entry#{$e_type}:focus:not(:only-child) {
+        + entry,
+        + button,
+        + combobox > button.combo { border-#{$_border}-color: if($var=='light', $e_color, $e_border); }
+      }
+    }
+    > button:checked + entry { border-#{$_border}-color: if($var=='light', $selected_bg_color, $e_border); }
+  }
+  @if $button_rules=='true' {
+    > button + button { border-#{$_border}-style: none; }
 
+    > button:hover:not(:checked):not(:active):not(:only-child),
+    > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { box-shadow: inset if($vert=='false', 1px 0, 0 1px) $b_border; }
 
-  > button:hover:not(:checked):not(:active):not(:only-child),
-  > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { box-shadow: -1px 0 $button_border; }
-  > button:first-child:hover:not(:checked):not(:active) { box-shadow: none; }
-  > button:checked + button:not(:checked):not(:active):hover { box-shadow: none; }
-  > button:checked + entry { border-left-color: if($variant=='light', $selected_bg_color, $entry_border); }
-  > entry + button:not(:checked):not(:active):not(:only-child):hover { box-shadow: none; }
+    > button:first-child:hover:not(:checked):not(:active),
+    > button:checked + button:not(:checked):not(:active):hover,
+    > entry + button:not(:checked):not(:active):not(:only-child):hover { box-shadow: none; }
+  }
 }
 
-// special case for path-bars
-.linked:not(.vertical).path-bar {
+// special case, because path-bars are bugged
+@mixin pathbar_linking_rules($sep_color:if($variant=='light', transparentize($button_border, 0.6), transparentize($button_border, 0.5))) {
 
-$_linked_separator_color: if($variant=='light', transparentize($button_border, 0.6), transparentize($button_border, 0.5));
+    > button + button { border-left-style: none; }
 
-  > button:hover:not(:checked):not(:active):not(:only-child) {
+    > button:hover:not(:checked):not(:active):not(:only-child) {
 
-    &:hover {
-      box-shadow: inset  1px 0 $_linked_separator_color,
-                  inset -1px 0 $_linked_separator_color;
+      &:hover {
+        box-shadow: inset  1px 0 $sep_color,
+                    inset -1px 0 $sep_color;
+      }
+      &:first-child:hover { box-shadow: inset -1px 0 $sep_color; }
+      &:last-child:hover { box-shadow: inset 1px 0 $sep_color; }
     }
-    &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
-    &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
-  }
 }
 
-// vertical
-.linked.vertical {
-  > entry { @extend %linked_vertical; }
-
-
-  > entry + entry { border-top-color: transparentize($entry_border, 0.7); }
-
-  > entry.error + entry,
-  > entry + entry.error { border-top-color: if($variant=='light', $error_color, transparentize($entry_border, 0.7)); }
-
-  > entry.warning + entry,
-  > entry + entry.warning { border-top-color: if($variant=='light', $warning_color, transparentize($entry_border, 0.7)); }
-
-  > entry.error + entry.warning { border-top-color: if($variant=='light', $error_color, transparentize($entry_border, 0.7));}
-
-
-  > entry + entry:focus:not(:last-child),
-  > entry + entry:focus:last-child { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
-
-  > entry + entry.warning:focus:not(:last-child),
-  > entry + entry.warning:focus:last-child { border-top-color: if($variant=='light', $warning_color, $entry_border); }
-
-  > entry + entry.error:focus:not(:last-child),
-  > entry + entry.error:focus:last-child { border-top-color: if($variant=='light', $error_color, $entry_border); }
-
-
-  > entry + button,
-  > entry + button:hover,
-  > entry + button:active,
-  > entry + button:checked,
-  > entry + button:disabled { border-top-style: solid; }
-
-
-  > entry:focus:not(:only-child) + entry,
-  > entry:focus:not(:only-child) + button,
-  > entry:focus:not(:only-child) + combobox > button.combo { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
-
-  > entry.warning:focus:not(:only-child) + entry,
-  > entry.warning:focus:not(:only-child) + button,
-  > entry.warning:focus:not(:only-child) + combobox > button.combo { border-top-color: if($variant=='light', $warning_color, $entry_border); }
-
-  > entry.error:focus:not(:only-child) + entry,
-  > entry.error:focus:not(:only-child) + button,
-  > entry.error:focus:not(:only-child) + combobox > button.combo { border-top-color: if($variant=='light', $error_color, $entry_border); }
-
-
-  > button:hover:not(:checked):not(:active):not(:only-child),
-  > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { box-shadow: 0 -1px $button_border; }
-  > button:first-child:hover:not(:checked):not(:active) { box-shadow: none; }
-  > button:checked + button:not(:checked):not(:active):hover { box-shadow: none; }
-  > button:checked + entry { border-top-color: if($variant=='light', $selected_bg_color, $entry_border); }
-  > entry + button:not(:checked):not(:active):hover { box-shadow: none; }
+// Apply the rules defined above
+.linked:not(.vertical) {
+  &:not(.path-bar) { @include linking_rules(); }
+  &.path-bar { @include pathbar_linking_rules(); }
 }
 
+.linked.vertical { @include linking_rules($vert:'true'); }
+
 %linked_middle {
   border-radius: 0;
   border-right-style: none;
@@ -696,16 +645,6 @@ $_linked_separator_color: if($variant=='light', transparentize($button_border, 0
   }
 }
 
-%linked_button {
-  border-left-style: none;
-  &:first-child { border-left-style: solid; }
-}
-
-%linked_vertical_button {
-  border-top-style: none;
-  &:first-child { border-top-style: solid; }
-}
-
 %undecorated_button {
   border-color: transparent;
   background-color: transparent;
@@ -1229,6 +1168,8 @@ headerbar {
   }
 
   // Linking stuff
+
+  // Reset buttons
   .linked:not(.vertical):not(.path-bar) > button,
   .linked:not(.vertical):not(.path-bar) > button:hover,
   .linked:not(.vertical):not(.path-bar) > button:active,
@@ -1236,89 +1177,35 @@ headerbar {
   .linked:not(.vertical):not(.path-bar) > button:disabled {
     border-radius: 3px;
     border-style: solid;
-    
   }
-  .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active):not(:only-child),
-  .linked:not(.vertical):not(.path-bar) > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active),
-  .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active):not(:only-child),
-  .linked:not(.vertical).path-bar > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { box-shadow: none; }
-
-  // special case for path-bars and stack-switchers
-  .linked:not(.vertical):not(.path-bar).stack-switcher > button,
-  .linked:not(.vertical).path-bar > button {
-
-    @include button(header-hover);
-
-    &:hover { background-color: lighten($header_button_bg, 15%); }
-    &:active, &:checked { @include button(header-active); }
-    &:disabled { color: transparentize($header_fg, 0.4); }
-  }
-
-  .linked:not(.vertical):not(.path-bar).stack-switcher > button,
-  .linked:not(.vertical).path-bar > button,
-  .linked:not(.vertical):not(.path-bar).stack-switcher > button:hover,
-  .linked:not(.vertical).path-bar > button:hover,
-  .linked:not(.vertical):not(.path-bar).stack-switcher > button:active,
-  .linked:not(.vertical).path-bar > button:active,
-  .linked:not(.vertical):not(.path-bar).stack-switcher > button:checked,
-  .linked:not(.vertical).path-bar > button:checked,
-  .linked:not(.vertical):not(.path-bar).stack-switcher > button:disabled,
-  .linked:not(.vertical).path-bar > button:disabled {
-    @extend %linked;
-    @extend %linked_button;
+  .linked:not(.vertical):not(.path-bar), .linked:not(.vertical).path-bar {
+    > button:hover:not(:checked):not(:active):not(:only-child),
+    > button:hover:not(:checked):not(:active) + button:not(:checked):not(:active) { box-shadow: none; }
   }
 
-  .linked:not(.vertical).path-bar,
-  .linked:not(.vertical):not(.path-bar).stack-switcher {
+  // special case for path-bars and stack-switchers
+  .linked:not(.vertical):not(.path-bar).stack-switcher,
+  .linked:not(.vertical).path-bar {
 
-    $_linked_separator_color: $header_button_border;
+    > button {
+      @include button(header-hover);
 
-    > button:hover:not(:checked):not(:active):not(:only-child) {
+      &:hover { background-color: lighten($header_button_bg, 15%); }
+      &:active, &:checked { @include button(header-active); }
+      &:disabled { color: transparentize($header_fg, 0.4); }
 
-      &:hover {
-        box-shadow: inset  1px 0 $_linked_separator_color,
-                    inset -1px 0 $_linked_separator_color;
-      }
-      &:first-child:hover { box-shadow: inset -1px 0 $_linked_separator_color; }
-      &:last-child:hover { box-shadow: inset 1px 0 $_linked_separator_color; }
+      &, &:hover, &:active, &:checked, &:disabled { @extend %linked; }
     }
-  }
-
-  .linked:not(.vertical):not(.pathbar) {
-
-    > entry + entry { border-left-color: transparentize($header_entry_border, 0.5); }
-
-    > entry.error + entry,
-    > entry + entry.error { border-left-color: if($variant=='light', $error_color, transparentize($header_entry_border, 0.5)); }
-
-    > entry.warning + entry,
-    > entry + entry.warning { border-left-color: if($variant=='light', $warning_color, transparentize($header_entry_border, 0.5)); }
-
-    > entry.error + entry.warning { border-left-color: if($variant=='light', $error_color, transparentize($header_entry_border, 0.5));}
-
-
-    > entry + entry:focus:not(:last-child),
-    > entry + entry:focus:last-child { border-left-color: if($darker=='false' and $variant=='light', $selected_bg_color, $header_entry_border); }
-
-    > entry + entry.warning:focus:not(:last-child),
-    > entry + entry.warning:focus:last-child { border-left-color: if($variant=='light', $warning_color, $header_entry_border); }
-
-    > entry + entry.error:focus:not(:last-child),
-    > entry + entry.error:focus:last-child { border-left-color: if($variant=='light', $error_color, $header_entry_border); }
-
-
-    > entry:focus:not(:only-child) + entry,
-    > entry:focus:not(:only-child) + button,
-    > entry:focus:not(:only-child) + combobox > button.combo { border-left-color:  if($darker=='false' and $variant=='light', $selected_bg_color, $header_entry_border); }
-
-    > entry.warning:focus:not(:only-child) + entry,
-    > entry.warning:focus:not(:only-child) + button,
-    > entry.warning:focus:not(:only-child) + combobox > button.combo { border-left-color: if($variant=='light', $warning_color, $header_entry_border); }
-
-    > entry.error:focus:not(:only-child) + entry,
-    > entry.error:focus:not(:only-child) + button,
-    > entry.error:focus:not(:only-child) + button.combo > button.combo { border-left-color: if($variant=='light', $error_color, $header_entry_border); }
 
+    @include pathbar_linking_rules($sep_color:$header_button_border);
+  }
+  // use linking rules for entries only
+  .linked:not(.vertical):not(.path-bar) {
+    @include linking_rules( $a:0.5,
+                            $var:if($variant=='light' and $darker=='false', 'light', 'dark'),
+                            $button_rules:'false',
+                            $e_border:$header_entry_border,
+                            $b_border:$header_button_border );
   }
 
   // Headerbar Suggested and Destructive Action buttons
@@ -3028,9 +2915,7 @@ headerbar,
     &:active, &:checked {
       @include button(header-active);
     }
-
     &.close, &.maximize, &.minimize {
-
       color: transparent;
       background-color: transparent;
       background-position: center;
@@ -3039,21 +2924,14 @@ headerbar,
 
       &:backdrop { opacity: 1; }
     }
+    // Load png assets for each button
+    @each $k in ('close','maximize', 'minimize') {
+      @each $l, $m in ('',''), (':backdrop','-backdrop'), (':hover','-hover'), (':active','-active') {
 
-    &.close { background-image: -gtk-scaled(url('assets/titlebutton-close#{$darker_asset_suffix}.png'),url('assets/titlebutton-close#{$darker_asset_suffix}@2.png')); }
-    &.close:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-close-backdrop#{$darker_asset_suffix}.png'),url('assets/titlebutton-close-backdrop#{$darker_asset_suffix}@2.png')); }
-    &.close:hover { background-image: -gtk-scaled(url('assets/titlebutton-close-hover#{$darker_asset_suffix}.png'),url('assets/titlebutton-close-hover#{$darker_asset_suffix}@2.png')); }
-    &.close:active { background-image: -gtk-scaled(url('assets/titlebutton-close-active#{$darker_asset_suffix}.png'),url('assets/titlebutton-close-active#{$darker_asset_suffix}@2.png')); }
-
-    &.maximize { background-image: -gtk-scaled(url('assets/titlebutton-max#{$darker_asset_suffix}.png'),url('assets/titlebutton-max#{$darker_asset_suffix}@2.png')); }
-    &.maximize:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-max-backdrop#{$darker_asset_suffix}.png'),url('assets/titlebutton-max-backdrop#{$darker_asset_suffix}@2.png')); }
-    &.maximize:hover { background-image: -gtk-scaled(url('assets/titlebutton-max-hover#{$darker_asset_suffix}.png'),url('assets/titlebutton-max-hover#{$darker_asset_suffix}@2.png')); }
-    &.maximize:active { background-image: -gtk-scaled(url('assets/titlebutton-max-active#{$darker_asset_suffix}.png'),url('assets/titlebutton-max-active#{$darker_asset_suffix}@2.png')); }
-
-    &.minimize { background-image: -gtk-scaled(url('assets/titlebutton-min#{$darker_asset_suffix}.png'),url('assets/titlebutton-min#{$darker_asset_suffix}@2.png')); }
-    &.minimize:backdrop { background-image: -gtk-scaled(url('assets/titlebutton-min-backdrop#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-backdrop#{$darker_asset_suffix}@2.png')); }
-    &.minimize:hover { background-image: -gtk-scaled(url('assets/titlebutton-min-hover#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-hover#{$darker_asset_suffix}@2.png')); }
-    &.minimize:active { background-image: -gtk-scaled(url('assets/titlebutton-min-active#{$darker_asset_suffix}.png'),url('assets/titlebutton-min-active#{$darker_asset_suffix}@2.png')); }
+        &.#{$k}#{$l} { background-image: -gtk-scaled(url('assets/titlebutton-#{$k}#{$m}#{$darker_asset_suffix}.png'),
+                                                     url('assets/titlebutton-#{$k}#{$m}#{$darker_asset_suffix}@2.png')); }
+      }
+    }
   }
 }