From 3932218fd0862627a3c614aaf6825256e66a5517 Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Tue, 30 Aug 2016 23:53:36 +0200
Subject: use color swatches for selected bg and fg in svg assets

---
 common/cinnamon/common-assets/menu/menu-hover.svg  | 30 +++++++--
 .../common-assets/misc/add-workspace-active.svg    | 55 ++++++++++++++---
 .../misc/calendar-arrow-left-hover.svg             | 28 +++++++--
 .../misc/calendar-arrow-right-hover.svg            | 28 +++++++--
 .../cinnamon/common-assets/misc/corner-ripple.svg  |  6 +-
 .../common-assets/panel/activities-active.svg      | 32 ++++++++--
 .../panel/window-list-active-bottom.svg            | 30 +++++++--
 .../common-assets/panel/window-list-active-top.svg | 28 +++++++--
 .../common-assets/switch/switch-off-selected.svg   | 38 ++++++++++--
 .../common-assets/switch/switch-on-selected.svg    | 66 ++++++++++++++++++--
 .../checkbox/checkbox-checked-focused.svg          | 27 ++++++--
 .../dark-assets/checkbox/checkbox-checked.svg      | 25 +++++++-
 .../checkbox/checkbox-unchecked-focused.svg        | 27 ++++++--
 common/cinnamon/dark-assets/misc/message.svg       | 30 +++++++--
 common/cinnamon/dark-assets/switch/switch-on.svg   | 27 ++++++--
 .../checkbox/checkbox-checked-focused.svg          | 57 +++++++++++++++--
 .../light-assets/checkbox/checkbox-checked.svg     | 55 +++++++++++++++--
 .../checkbox/checkbox-unchecked-focused.svg        | 25 +++++++-
 common/cinnamon/light-assets/misc/message.svg      | 37 +++++++++--
 common/cinnamon/light-assets/switch/switch-on.svg  | 72 +++++++++++++++++++---
 20 files changed, 624 insertions(+), 99 deletions(-)

(limited to 'common/cinnamon')

diff --git a/common/cinnamon/common-assets/menu/menu-hover.svg b/common/cinnamon/common-assets/menu/menu-hover.svg
index 6ae13ca..4d3f262 100644
--- a/common/cinnamon/common-assets/menu/menu-hover.svg
+++ b/common/cinnamon/common-assets/menu/menu-hover.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="9.0311108mm"
@@ -17,7 +19,25 @@
    inkscape:version="0.91 r13725"
    sodipodi:docname="menu-hover.svg">
   <defs
-     id="defs6929" />
+     id="defs6929">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4138" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4140"
+       x1="1185"
+       y1="108"
+       x2="1185"
+       y2="141"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -26,8 +46,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.2"
-     inkscape:cx="16.532799"
-     inkscape:cy="17.338845"
+     inkscape:cx="0.595299"
+     inkscape:cy="17.160274"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -71,14 +91,14 @@
     <g
        transform="matrix(0.0689655,0,0,1.0000001,71.275885,274.36218)"
        id="g6908"
-       style="fill:#5294e2;fill-opacity:1">
+       style="fill:url(#linearGradient4140);fill-opacity:1">
       <rect
          y="108"
          x="1011"
          height="33"
          width="348"
          id="rect5271"
-         style="opacity:1;fill:#5294e2;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" />
+         style="opacity:1;fill:url(#linearGradient4140);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>
 </svg>
diff --git a/common/cinnamon/common-assets/misc/add-workspace-active.svg b/common/cinnamon/common-assets/misc/add-workspace-active.svg
index f60de34..d39784c 100644
--- a/common/cinnamon/common-assets/misc/add-workspace-active.svg
+++ b/common/cinnamon/common-assets/misc/add-workspace-active.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="35"
@@ -16,7 +18,42 @@
    inkscape:version="0.91 r13725"
    sodipodi:docname="add-workspace-active.svg">
   <defs
-     id="defs4" />
+     id="defs4">
+    <linearGradient
+       id="selected_fg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4147" />
+    </linearGradient>
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4144" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4146"
+       x1="19.500005"
+       y1="853.36218"
+       x2="19.500005"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4149"
+       x1="18.000003"
+       y1="944.36218"
+       x2="18.000003"
+       y2="960.36218"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,8 +62,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8"
-     inkscape:cx="-12.039549"
-     inkscape:cy="88.924726"
+     inkscape:cx="1.6114609"
+     inkscape:cy="95.511861"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -65,7 +102,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -75,7 +112,7 @@
      id="layer1"
      transform="translate(0,-852.36218)">
     <path
-       style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       style="opacity:1;fill:url(#selected_bg_color);fill-opacity:1;stroke:none;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
        d="M 3 0 C 1.3380015 0 0 1.3380015 0 3 L 0 197 C 0 198.662 1.3380015 200 3 200 L 36 200 C 37.661999 200 39 198.662 39 197 L 39 3 C 39 1.3380015 37.661999 0 36 0 L 3 0 z M 3 1 L 36 1 C 37.108 1 38 1.892 38 3 L 38 197 C 38 198.108 37.108 199 36 199 L 3 199 C 1.892 199 1 198.108 1 197 L 1 3 C 1 1.892 1.892 1 3 1 z "
        transform="translate(0,852.36218)"
        id="rect3810" />
@@ -85,7 +122,7 @@
        style="fill:#000000;fill-opacity:1;opacity:0.5" />
     <rect
        rx="2"
-       style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient4146);fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect3812"
        width="37"
        height="198"
@@ -94,7 +131,7 @@
        ry="2" />
     <g
        id="g3917"
-       style="fill:#ffffff;fill-opacity:1">
+       style="fill:url(#linearGradient4149);fill-opacity:1">
       <rect
          ry="1.1428567"
          y="944.36218"
@@ -102,7 +139,7 @@
          height="15.999994"
          width="2.0000002"
          id="rect3897"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="opacity:1;fill:url(#linearGradient4149);fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
       <rect
          transform="matrix(0,1,-1,0,0,0)"
          ry="1.1428567"
@@ -111,7 +148,7 @@
          height="15.999994"
          width="2.0000002"
          id="rect3897-6"
-         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
+         style="opacity:1;fill:url(#linearGradient4149);fill-opacity:1;stroke:#102b68;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
     </g>
   </g>
 </svg>
diff --git a/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg b/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg
index a5cc13e..9292ecc 100644
--- a/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg
+++ b/common/cinnamon/common-assets/misc/calendar-arrow-left-hover.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="calendar-arrow-left-hover.svg"
@@ -33,8 +35,8 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer12"
-     inkscape:cx="14.072123"
-     inkscape:cy="8.0207106"
+     inkscape:cx="6.1613659"
+     inkscape:cy="7.9323223"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -92,7 +94,25 @@
   <title
      id="title9167">Gnome Symbolic Icon Theme</title>
   <defs
-     id="defs7386" />
+     id="defs7386">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4147" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4149"
+       x1="108.00018"
+       y1="751"
+       x2="108.00018"
+       y2="758.99959"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <g
      inkscape:groupmode="layer"
      id="layer9"
@@ -144,7 +164,7 @@
      style="display:inline"
      transform="translate(-100.0002,-747)">
     <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4149);fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 109.82336,751.00006 a 0.67182557,0.66502524 0 0 0 -0.10367,0.009 0.67182557,0.66502524 0 0 0 -0.39887,0.18702 l -3.35878,3.32479 -0.46184,0.47795 0.46184,0.47792 3.35878,3.32481 a 0.68281953,0.67590797 0 0 0 0.698,0.16363 c 0.0374,0.0143 0.0779,0.0233 0.1207,0.0233 0.18608,0 0.33589,-0.14829 0.33589,-0.33248 0,-0.0423 -0.009,-0.0823 -0.0236,-0.11948 a 0.68281953,0.67590797 0 0 0 -0.16531,-0.69094 l -2.876,-2.84689 2.87597,-2.84686 a 0.67182557,0.66502524 0 0 0 0.17056,-0.72082 c 0.008,-0.0292 0.0185,-0.058 0.0185,-0.0896 0,-0.18421 -0.14978,-0.33249 -0.33587,-0.33249 -0.0395,0 -0.0765,0.01 -0.11152,0.022 A 0.67182557,0.66502524 0 0 0 109.82334,751 Z"
        id="path6040"
        inkscape:connector-curvature="0" />
diff --git a/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg b/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg
index f718628..e29be39 100644
--- a/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg
+++ b/common/cinnamon/common-assets/misc/calendar-arrow-right-hover.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    sodipodi:docname="calendar-arrow-right-hover.svg"
@@ -33,8 +35,8 @@
      bordercolor="#666666"
      borderopacity="1"
      inkscape:current-layer="layer12"
-     inkscape:cx="14.072123"
-     inkscape:cy="8.0207106"
+     inkscape:cx="6.1613659"
+     inkscape:cy="7.9323223"
      gridtolerance="10"
      inkscape:guide-bbox="true"
      guidetolerance="10"
@@ -92,7 +94,25 @@
   <title
      id="title9167">Gnome Symbolic Icon Theme</title>
   <defs
-     id="defs7386" />
+     id="defs7386">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4147" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4149"
+       x1="108.00017"
+       y1="751"
+       x2="108.00017"
+       y2="758.99959"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <g
      inkscape:groupmode="layer"
      id="layer9"
@@ -144,7 +164,7 @@
      style="display:inline"
      transform="translate(-100.0002,-747)">
     <path
-       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4149);fill-opacity:1;stroke:none;stroke-width:2;marker:none;enable-background:accumulate"
        d="m 106.17699,751.00006 a 0.67182557,0.66502524 0 0 1 0.10367,0.009 0.67182557,0.66502524 0 0 1 0.39887,0.18702 l 3.35878,3.32479 0.46184,0.47795 -0.46184,0.47792 -3.35878,3.32481 a 0.68281953,0.67590797 0 0 1 -0.698,0.16363 c -0.0374,0.0143 -0.0779,0.0233 -0.1207,0.0233 -0.18608,0 -0.33589,-0.14829 -0.33589,-0.33248 0,-0.0423 0.009,-0.0823 0.0236,-0.11948 a 0.68281953,0.67590797 0 0 1 0.16531,-0.69094 l 2.876,-2.84689 -2.87597,-2.84686 a 0.67182557,0.66502524 0 0 1 -0.17056,-0.72082 c -0.008,-0.0292 -0.0185,-0.058 -0.0185,-0.0896 0,-0.18421 0.14978,-0.33249 0.33587,-0.33249 0.0395,0 0.0765,0.01 0.11152,0.022 A 0.67182557,0.66502524 0 0 1 106.17701,751 Z"
        id="path6040"
        inkscape:connector-curvature="0" />
diff --git a/common/cinnamon/common-assets/misc/corner-ripple.svg b/common/cinnamon/common-assets/misc/corner-ripple.svg
index ff58c92..3f52f68 100644
--- a/common/cinnamon/common-assets/misc/corner-ripple.svg
+++ b/common/cinnamon/common-assets/misc/corner-ripple.svg
@@ -34,8 +34,8 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:zoom="2.3864854"
-     inkscape:cx="-38.639816"
-     inkscape:cy="27.143174"
+     inkscape:cx="54.174496"
+     inkscape:cy="43.066171"
      inkscape:current-layer="svg2" />
   <defs
      id="defs4">
@@ -68,7 +68,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
diff --git a/common/cinnamon/common-assets/panel/activities-active.svg b/common/cinnamon/common-assets/panel/activities-active.svg
index 6986f5c..ae5c602 100644
--- a/common/cinnamon/common-assets/panel/activities-active.svg
+++ b/common/cinnamon/common-assets/panel/activities-active.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="90.000000"
@@ -30,8 +32,8 @@
      inkscape:pageopacity="1"
      inkscape:pageshadow="2"
      inkscape:zoom="22.627417"
-     inkscape:cx="3.5498385"
-     inkscape:cy="11.547553"
+     inkscape:cx="4.4779162"
+     inkscape:cy="11.459165"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -76,7 +78,25 @@
        id="guide4135" />
   </sodipodi:namedview>
   <defs
-     id="defs3" />
+     id="defs3">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4140" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4142"
+       x1="6"
+       y1="287"
+       x2="6"
+       y2="289"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -134,21 +154,21 @@
      id="layer1"
      transform="translate(0,-276)">
     <rect
-       style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:url(#linearGradient4142);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4138"
        width="2"
        height="2"
        x="5"
        y="287" />
     <rect
-       style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+       style="display:inline;opacity:1;fill:url(#selected_bg_color);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
        id="rect4138-6"
        width="2"
        height="2"
        x="11"
        y="287" />
     <rect
-       style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
+       style="display:inline;opacity:1;fill:url(#selected_bg_color);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;enable-background:new"
        id="rect4138-9"
        width="2"
        height="2"
diff --git a/common/cinnamon/common-assets/panel/window-list-active-bottom.svg b/common/cinnamon/common-assets/panel/window-list-active-bottom.svg
index ce7d5d7..fbe4599 100644
--- a/common/cinnamon/common-assets/panel/window-list-active-bottom.svg
+++ b/common/cinnamon/common-assets/panel/window-list-active-bottom.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="90.000000"
@@ -16,7 +18,7 @@
    id="svg11300"
    sodipodi:version="0.32"
    inkscape:version="0.91 r13725"
-   sodipodi:docname="running1.svg"
+   sodipodi:docname="window-list-active-bottom.svg"
    inkscape:output_extension="org.inkscape.output.svg.inkscape"
    version="1.0"
    style="display:inline;enable-background:new">
@@ -30,8 +32,8 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="19.769528"
-     inkscape:cx="15.988499"
-     inkscape:cy="3.1982956"
+     inkscape:cx="6.9341604"
+     inkscape:cy="3.0971298"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -74,7 +76,25 @@
        snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
   <defs
-     id="defs3" />
+     id="defs3">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4137" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4139"
+       x1="14"
+       y1="298"
+       x2="14"
+       y2="300"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -132,7 +152,7 @@
      id="layer1"
      transform="translate(0,-296)">
     <rect
-       style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none"
+       style="opacity:1;fill:url(#linearGradient4139);fill-opacity:1;stroke:none"
        id="rect4270-9"
        width="24"
        height="2"
diff --git a/common/cinnamon/common-assets/panel/window-list-active-top.svg b/common/cinnamon/common-assets/panel/window-list-active-top.svg
index d2b8f15..54a9036 100644
--- a/common/cinnamon/common-assets/panel/window-list-active-top.svg
+++ b/common/cinnamon/common-assets/panel/window-list-active-top.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    inkscape:export-ydpi="90.000000"
@@ -30,8 +32,8 @@
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
      inkscape:zoom="19.769528"
-     inkscape:cx="6.908869"
-     inkscape:cy="3.1982956"
+     inkscape:cx="-2.1454696"
+     inkscape:cy="3.0971298"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -74,7 +76,25 @@
        snapvisiblegridlinesonly="true" />
   </sodipodi:namedview>
   <defs
-     id="defs3" />
+     id="defs3">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4137" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4139"
+       x1="14"
+       y1="296"
+       x2="14"
+       y2="298"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <metadata
      id="metadata4">
     <rdf:RDF>
@@ -132,7 +152,7 @@
      id="layer1"
      transform="translate(0,-296)">
     <rect
-       style="opacity:1;fill:#5294e2;fill-opacity:1;stroke:none"
+       style="opacity:1;fill:url(#linearGradient4139);fill-opacity:1;stroke:none"
        id="rect4270-9"
        width="24"
        height="2"
diff --git a/common/cinnamon/common-assets/switch/switch-off-selected.svg b/common/cinnamon/common-assets/switch/switch-off-selected.svg
index c85eeee..c374f22 100644
--- a/common/cinnamon/common-assets/switch/switch-off-selected.svg
+++ b/common/cinnamon/common-assets/switch/switch-off-selected.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="50"
@@ -17,6 +19,14 @@
    sodipodi:docname="switch-off-selected.svg">
   <defs
      id="defs7541">
+    <linearGradient
+       id="selected_fg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4164" />
+    </linearGradient>
     <linearGradient
        id="linearGradient4695-1-4-3-5-0-6">
       <stop
@@ -91,6 +101,24 @@
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4166"
+       x1="41"
+       y1="1032.3622"
+       x2="41"
+       y2="1050.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4168"
+       x1="1046.0012"
+       y1="336.99982"
+       x2="1046.0012"
+       y2="343"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -100,9 +128,9 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="8.2495794"
-     inkscape:cx="-2.2858532"
-     inkscape:cy="2.3994423"
-     inkscape:current-layer="layer1"
+     inkscape:cx="34.261465"
+     inkscape:cy="7.0057377"
+     inkscape:current-layer="switch-selected"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
@@ -183,7 +211,7 @@
                ry="11"
                rx="11" />
             <circle
-               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:url(#linearGradient4166);fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="path3759-7-1"
                cx="41"
                cy="1041.3622"
@@ -195,7 +223,7 @@
          inkscape:connector-curvature="0"
          d="m 1043.0028,337 0.75,0 c 0.01,-9e-5 0.016,-3.5e-4 0.023,0 0.1912,0.008 0.3824,0.0964 0.5156,0.23437 l 1.711,1.71094 1.7343,-1.71094 c 0.1993,-0.17287 0.335,-0.22912 0.5157,-0.23437 l 0.75,0 0,0.75 c 0,0.21485 -0.026,0.41298 -0.1875,0.5625 l -1.711,1.71093 1.6875,1.6875 c 0.1412,0.14113 0.211,0.34009 0.211,0.53907 l 0,0.75 -0.75,0 c -0.199,-10e-6 -0.398,-0.0698 -0.5391,-0.21094 l -1.7109,-1.71094 -1.711,1.71094 c -0.1411,0.14114 -0.3401,0.21094 -0.539,0.21094 l -0.75,0 0,-0.75 c 0,-0.19897 0.07,-0.39794 0.2109,-0.53907 l 1.7109,-1.6875 -1.7109,-1.71093 c -0.1581,-0.14598 -0.2274,-0.35194 -0.2109,-0.5625 l 0,-0.75 z"
          id="path10839-9-8-2-2-5-7"
-         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
+         style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';-inkscape-font-specification:'Andale Mono';text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;display:inline;overflow:visible;visibility:visible;opacity:0.6;fill:url(#linearGradient4168);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78124988;marker:none;enable-background:new" />
     </g>
   </g>
 </svg>
diff --git a/common/cinnamon/common-assets/switch/switch-on-selected.svg b/common/cinnamon/common-assets/switch/switch-on-selected.svg
index 7c2572d..a86b37a 100644
--- a/common/cinnamon/common-assets/switch/switch-on-selected.svg
+++ b/common/cinnamon/common-assets/switch/switch-on-selected.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="50"
@@ -17,6 +19,22 @@
    sodipodi:docname="switch-on-selected.svg">
   <defs
      id="defs7541">
+    <linearGradient
+       id="selected_fg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4171" />
+    </linearGradient>
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4166" />
+    </linearGradient>
     <linearGradient
        id="linearGradient4695-1-4-3-5-0-6">
       <stop
@@ -91,6 +109,42 @@
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4168"
+       x1="980.04999"
+       y1="-456.09485"
+       x2="980.04999"
+       y2="-454.09487"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4170"
+       x1="981.54999"
+       y1="-462.09485"
+       x2="981.54999"
+       y2="-454.09487"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4172"
+       x1="41"
+       y1="1032.3622"
+       x2="41"
+       y2="1050.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4173"
+       x1="26"
+       y1="1031.3622"
+       x2="26"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -100,8 +154,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.666667"
-     inkscape:cx="20.556458"
-     inkscape:cy="-1.6685358"
+     inkscape:cx="14.042172"
+     inkscape:cy="11.702892"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -175,7 +229,7 @@
                x="0"
                y="1029.3622" />
             <rect
-               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:url(#linearGradient4173);fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="rect2987-0-8-4"
                width="50"
                height="20"
@@ -184,7 +238,7 @@
                ry="11"
                rx="11" />
             <circle
-               style="fill:#5294e2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:url(#linearGradient4172);fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="path3759-0-7"
                cx="41"
                cy="1041.3622"
@@ -204,7 +258,7 @@
            height="1.9999826"
            width="5"
            id="rect3977-39-2-1"
-           style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:url(#linearGradient4168);fill-opacity:1;stroke:none" />
         <rect
            transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
            ry="0"
@@ -213,7 +267,7 @@
            height="7.9999828"
            width="2"
            id="rect3979-7-0-8"
-           style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:url(#linearGradient4170);fill-opacity:1;stroke:none" />
       </g>
     </g>
   </g>
diff --git a/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg b/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg
index 7789a23..0c2a8ee 100644
--- a/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg
+++ b/common/cinnamon/dark-assets/checkbox/checkbox-checked-focused.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
@@ -20,6 +22,14 @@
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4159" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3768-6">
       <stop
@@ -39,6 +49,15 @@
          offset="1"
          id="stop3776-1" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4161"
+       x1="25"
+       y1="31.362191"
+       x2="25"
+       y2="45.362191"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -48,8 +67,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.313709"
-     inkscape:cx="-7.2080158"
-     inkscape:cy="7.7067432"
+     inkscape:cx="-8.8873943"
+     inkscape:cy="0.45889901"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -82,7 +101,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -136,7 +155,7 @@
                  height="13.99999"
                  width="13.999989"
                  id="rect5147-9-1-5-7-6-7-4"
-                 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#5294e2;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4161);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                  ry="1.9999917" />
             </g>
           </g>
diff --git a/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg b/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg
index d2f64f9..b17ab7c 100644
--- a/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg
+++ b/common/cinnamon/dark-assets/checkbox/checkbox-checked.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
@@ -20,6 +22,14 @@
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4159" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3768-6">
       <stop
@@ -39,6 +49,15 @@
          offset="1"
          id="stop3776-1" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4161"
+       x1="25"
+       y1="31.362191"
+       x2="25"
+       y2="45.362191"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -48,8 +67,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.313709"
-     inkscape:cx="-7.3847925"
-     inkscape:cy="7.7067432"
+     inkscape:cx="-1.9931035"
+     inkscape:cy="7.5299665"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -136,7 +155,7 @@
                  height="13.99999"
                  width="13.999989"
                  id="rect5147-9-1-5-7-6-7-4"
-                 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#5294e2;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                 style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4161);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                  ry="1.9999917" />
             </g>
           </g>
diff --git a/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg b/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg
index fcaae67..0c111f0 100644
--- a/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg
+++ b/common/cinnamon/dark-assets/checkbox/checkbox-unchecked-focused.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
@@ -20,6 +22,14 @@
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4150" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3768-6">
       <stop
@@ -39,6 +49,15 @@
          offset="1"
          id="stop3776-1" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4152"
+       x1="25"
+       y1="31.362183"
+       x2="25"
+       y2="45.36218"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -48,8 +67,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.313709"
-     inkscape:cx="-7.2080158"
-     inkscape:cy="7.7067432"
+     inkscape:cx="5.2547407"
+     inkscape:cy="14.601034"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -82,7 +101,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -126,7 +145,7 @@
              id="g5400-2-47">
             <rect
                ry="2"
-               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d323d;fill-opacity:1;stroke:#5294e2;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#2d323d;fill-opacity:1;stroke:url(#linearGradient4152);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                id="rect5147-9-1-5-7-6-3-70"
                width="13"
                height="12.999997"
diff --git a/common/cinnamon/dark-assets/misc/message.svg b/common/cinnamon/dark-assets/misc/message.svg
index 2fb2d4f..7c8f1b6 100644
--- a/common/cinnamon/dark-assets/misc/message.svg
+++ b/common/cinnamon/dark-assets/misc/message.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="32"
@@ -17,7 +19,25 @@
    inkscape:version="0.91 r13725"
    sodipodi:docname="message.svg">
   <defs
-     id="defs6623" />
+     id="defs6623">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4138" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4140"
+       x1="2"
+       y1="1021.3622"
+       x2="2"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -25,9 +45,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="5.6"
-     inkscape:cx="28.080846"
-     inkscape:cy="10.089671"
+     inkscape:zoom="15.839192"
+     inkscape:cx="0.58833524"
+     inkscape:cy="24.231157"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -67,7 +87,7 @@
        rx="1.5"
        ry="1.5" />
     <path
-       style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.39215686"
+       style="display:inline;opacity:1;fill:url(#linearGradient4140);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.39215686"
        d="m 2.5,1021.3622 0.5,0 0,30 -0.5,0 c -0.831,0 -1.5,-0.669 -1.5,-1.5 l 0,-27 c 0,-0.831 0.669,-1.5 1.5,-1.5 z"
        id="rect4162"
        inkscape:connector-curvature="0"
diff --git a/common/cinnamon/dark-assets/switch/switch-on.svg b/common/cinnamon/dark-assets/switch/switch-on.svg
index baf1339..b6a9be9 100644
--- a/common/cinnamon/dark-assets/switch/switch-on.svg
+++ b/common/cinnamon/dark-assets/switch/switch-on.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="50"
@@ -17,6 +19,14 @@
    sodipodi:docname="switch-on.svg">
   <defs
      id="defs7541">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4166" />
+    </linearGradient>
     <linearGradient
        id="linearGradient4695-1-4-3-5-0-6">
       <stop
@@ -91,6 +101,15 @@
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4168"
+       x1="26"
+       y1="1031.3622"
+       x2="26"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -100,8 +119,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.666667"
-     inkscape:cx="26.273653"
-     inkscape:cy="16.301439"
+     inkscape:cx="10.930796"
+     inkscape:cy="16.13001"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
@@ -140,7 +159,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -175,7 +194,7 @@
                x="0"
                y="1029.3622" />
             <rect
-               style="fill:#5294e2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:url(#linearGradient4168);fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="rect2987-0-8-7"
                width="50"
                height="20"
diff --git a/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg b/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg
index 983e7f8..e214088 100644
--- a/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg
+++ b/common/cinnamon/light-assets/checkbox/checkbox-checked-focused.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
@@ -20,6 +22,22 @@
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
+    <linearGradient
+       id="selected_fg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4169" />
+    </linearGradient>
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4166" />
+    </linearGradient>
     <linearGradient
        id="linearGradient7704">
       <stop
@@ -61,6 +79,33 @@
          offset="1"
          id="stop3973-0-5-3" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4168"
+       x1="25"
+       y1="31.362191"
+       x2="25"
+       y2="45.362191"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4171"
+       x1="10.5"
+       y1="1033.3622"
+       x2="10.5"
+       y2="1035.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4173"
+       x1="12"
+       y1="1027.3622"
+       x2="12"
+       y2="1035.3622"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -70,8 +115,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.313709"
-     inkscape:cx="-9.3871547"
-     inkscape:cy="3.2519169"
+     inkscape:cx="-12.701718"
+     inkscape:cy="-4.172704"
      inkscape:document-units="px"
      inkscape:current-layer="checkbox-checked-dark"
      showgrid="true"
@@ -105,7 +150,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -163,7 +208,7 @@
                    height="13.99999"
                    width="13.999989"
                    id="rect5147-9-1-5-7-6-7"
-                   style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#5294e2;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                   style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4168);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                    ry="1.9999917" />
               </g>
             </g>
@@ -196,7 +241,7 @@
                    height="1.9999826"
                    width="5"
                    id="rect3977-39"
-                   style="fill:#ffffff;fill-opacity:1;stroke:none" />
+                   style="fill:url(#linearGradient4171);fill-opacity:1;stroke:none" />
                 <rect
                    ry="0"
                    y="1027.3622"
@@ -204,7 +249,7 @@
                    height="7.9999828"
                    width="2"
                    id="rect3979-7"
-                   style="fill:#ffffff;fill-opacity:1;stroke:none" />
+                   style="fill:url(#linearGradient4173);fill-opacity:1;stroke:none" />
               </g>
               <rect
                  style="fill:#eeeeee;fill-opacity:0;stroke:none"
diff --git a/common/cinnamon/light-assets/checkbox/checkbox-checked.svg b/common/cinnamon/light-assets/checkbox/checkbox-checked.svg
index e8da8e6..6b5caeb 100644
--- a/common/cinnamon/light-assets/checkbox/checkbox-checked.svg
+++ b/common/cinnamon/light-assets/checkbox/checkbox-checked.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
@@ -20,6 +22,22 @@
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
+    <linearGradient
+       id="selected_fg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4169" />
+    </linearGradient>
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4166" />
+    </linearGradient>
     <linearGradient
        id="linearGradient7704">
       <stop
@@ -61,6 +79,33 @@
          offset="1"
          id="stop3973-0-5-3" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4168"
+       x1="25"
+       y1="31.362191"
+       x2="25"
+       y2="45.362191"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4171"
+       x1="10.5"
+       y1="1033.3622"
+       x2="10.5"
+       y2="1035.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4173"
+       x1="12"
+       y1="1027.3622"
+       x2="12"
+       y2="1035.3622"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -70,8 +115,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.313709"
-     inkscape:cx="-9.3871547"
-     inkscape:cy="3.2519169"
+     inkscape:cx="-16.237251"
+     inkscape:cy="2.8983635"
      inkscape:document-units="px"
      inkscape:current-layer="checkbox-checked-dark"
      showgrid="true"
@@ -163,7 +208,7 @@
                    height="13.99999"
                    width="13.999989"
                    id="rect5147-9-1-5-7-6-7"
-                   style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#5294e2;fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+                   style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient4168);fill-opacity:1;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                    ry="1.9999917" />
               </g>
             </g>
@@ -196,7 +241,7 @@
                    height="1.9999826"
                    width="5"
                    id="rect3977-39"
-                   style="fill:#ffffff;fill-opacity:1;stroke:none" />
+                   style="fill:url(#linearGradient4171);fill-opacity:1;stroke:none" />
                 <rect
                    ry="0"
                    y="1027.3622"
@@ -204,7 +249,7 @@
                    height="7.9999828"
                    width="2"
                    id="rect3979-7"
-                   style="fill:#ffffff;fill-opacity:1;stroke:none" />
+                   style="fill:url(#linearGradient4173);fill-opacity:1;stroke:none" />
               </g>
               <rect
                  style="fill:#eeeeee;fill-opacity:0;stroke:none"
diff --git a/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg b/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg
index 6c2f719..da48d45 100644
--- a/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg
+++ b/common/cinnamon/light-assets/checkbox/checkbox-unchecked-focused.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="16"
@@ -20,6 +22,14 @@
    inkscape:export-ydpi="90">
   <defs
      id="defs4">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4150" />
+    </linearGradient>
     <linearGradient
        id="linearGradient3768-6">
       <stop
@@ -39,6 +49,15 @@
          offset="1"
          id="stop3776-1" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4152"
+       x1="25"
+       y1="31.362183"
+       x2="25"
+       y2="45.36218"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -48,8 +67,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="11.313709"
-     inkscape:cx="5.9470841"
-     inkscape:cy="-0.94340514"
+     inkscape:cx="-9.8744294"
+     inkscape:cy="-1.1201818"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -126,7 +145,7 @@
              id="g5400-2">
             <rect
                ry="2"
-               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:#5294e2;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
+               style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;stroke:url(#linearGradient4152);stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
                id="rect5147-9-1-5-7-6-3"
                width="13"
                height="12.999997"
diff --git a/common/cinnamon/light-assets/misc/message.svg b/common/cinnamon/light-assets/misc/message.svg
index a1f8615..039cb8f 100644
--- a/common/cinnamon/light-assets/misc/message.svg
+++ b/common/cinnamon/light-assets/misc/message.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="32"
@@ -17,7 +19,26 @@
    inkscape:version="0.91 r13725"
    sodipodi:docname="message.svg">
   <defs
-     id="defs6623" />
+     id="defs6623">
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4153" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4155"
+       x1="2"
+       y1="1020.3622"
+       x2="2"
+       y2="1052.3622"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3333334,0,0,1.032258,-0.66666666,-33.431038)" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -26,8 +47,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="-0.89235979"
-     inkscape:cy="34.935138"
+     inkscape:cx="-3.6188723"
+     inkscape:cy="36.101629"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -67,10 +88,16 @@
        rx="1.5"
        ry="1.5" />
     <path
-       style="display:inline;opacity:1;fill:#5294e2;fill-opacity:1;stroke:#2879db;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="m 2.75,1020.8622 0.75,0 0,31 -0.75,0 c -1.2465,0 -2.25,-0.6805 -2.25,-1.5259 l 0,-27.9482 c 0,-0.8454 1.0035,-1.5259 2.25,-1.5259 z"
+       style="display:inline;opacity:1;fill:url(#linearGradient4155);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       d="m 3,1020.3622 1,0 0,32 -1,0 c -1.662,0 -3,-0.7025 -3,-1.5751 l 0,-28.8498 c 0,-0.8726 1.338,-1.5751 3,-1.5751 z"
        id="rect4162-5"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="sccssss" />
+    <path
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.08095238"
+       d="m 2.75,1020.8622 0.75,0 0,31 -0.75,0 c -1.2465,0 -2.25,-0.6805 -2.25,-1.5259 l 0,-27.9482 c 0,-0.8454 1.0035,-1.5259 2.25,-1.5259 z"
+       id="rect4162-5-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sccssss" />
   </g>
 </svg>
diff --git a/common/cinnamon/light-assets/switch/switch-on.svg b/common/cinnamon/light-assets/switch/switch-on.svg
index 0203bbb..9945e14 100644
--- a/common/cinnamon/light-assets/switch/switch-on.svg
+++ b/common/cinnamon/light-assets/switch/switch-on.svg
@@ -2,11 +2,13 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="50"
@@ -17,6 +19,22 @@
    sodipodi:docname="switch-on.svg">
   <defs
      id="defs7541">
+    <linearGradient
+       id="selected_fg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4181" />
+    </linearGradient>
+    <linearGradient
+       id="selected_bg_color"
+       osb:paint="solid">
+      <stop
+         style="stop-color:#5294e2;stop-opacity:1;"
+         offset="0"
+         id="stop4166" />
+    </linearGradient>
     <linearGradient
        id="linearGradient4695-1-4-3-5-0-6">
       <stop
@@ -91,6 +109,42 @@
          offset="1"
          style="stop-color:#ffffff;stop-opacity:1;" />
     </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_bg_color"
+       id="linearGradient4168"
+       x1="26"
+       y1="1031.3622"
+       x2="26"
+       y2="1051.3622"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4183"
+       x1="980.04999"
+       y1="-456.09485"
+       x2="980.04999"
+       y2="-454.09487"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4185"
+       x1="981.54999"
+       y1="-462.09485"
+       x2="981.54999"
+       y2="-454.09487"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#selected_fg_color"
+       id="linearGradient4187"
+       x1="41"
+       y1="1032.3622"
+       x2="41"
+       y2="1050.3622"
+       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -99,10 +153,10 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="32.998318"
-     inkscape:cx="6.3160735"
-     inkscape:cy="9.1853829"
-     inkscape:current-layer="layer1"
+     inkscape:zoom="8.2495795"
+     inkscape:cx="1.2517535"
+     inkscape:cy="0.45938131"
+     inkscape:current-layer="switch-active-2"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
@@ -140,7 +194,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -175,7 +229,7 @@
                x="0"
                y="1029.3622" />
             <rect
-               style="fill:#5294e2;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:url(#linearGradient4168);fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="rect2987-0-8"
                width="50"
                height="20"
@@ -184,7 +238,7 @@
                ry="11"
                rx="11" />
             <circle
-               style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none"
+               style="fill:url(#linearGradient4187);fill-opacity:1;fill-rule:nonzero;stroke:none"
                id="path3759-0"
                cx="41"
                cy="1041.3622"
@@ -204,7 +258,7 @@
            height="1.9999826"
            width="5"
            id="rect3977-39-2"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:url(#linearGradient4183);fill-opacity:1;stroke:none" />
         <rect
            transform="matrix(0.70710678,0.70710678,-0.70710678,0.70710678,0,0)"
            ry="0"
@@ -213,7 +267,7 @@
            height="7.9999828"
            width="2"
            id="rect3979-7-0"
-           style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:none" />
+           style="display:inline;opacity:1;fill:url(#linearGradient4185);fill-opacity:1;stroke:none" />
       </g>
     </g>
   </g>
-- 
cgit v1.2.3


From 06b091100947a17f29b82f92bf0fa38735eaabac Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Wed, 31 Aug 2016 00:00:33 +0200
Subject: don't use selected_fg_color in weird places

---
 common/cinnamon/cinnamon-dark.css | 100 +++++++++++++++++++-------------------
 common/cinnamon/cinnamon.css      | 100 +++++++++++++++++++-------------------
 common/cinnamon/sass/_colors.scss |   9 +++-
 common/cinnamon/sass/_common.scss |  22 +++++----
 4 files changed, 120 insertions(+), 111 deletions(-)

(limited to 'common/cinnamon')

diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css
index 584ea8b..2da56b1 100644
--- a/common/cinnamon/cinnamon-dark.css
+++ b/common/cinnamon/cinnamon-dark.css
@@ -22,7 +22,7 @@ stage {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #444a58;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
   .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
@@ -34,14 +34,14 @@ stage {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #D3DAE3;
     background-color: #444a58;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(68, 74, 88, 0.05); }
   .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
-    background-color: #5294E2;
-    border: 1px solid #5294E2;
-    box-shadow: inset 0 2px 4px #5294E2; }
+    background-color: #5294e2;
+    border: 1px solid #5294e2;
+    box-shadow: inset 0 2px 4px #5294e2; }
   .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: rgba(211, 218, 227, 0.45);
@@ -64,12 +64,12 @@ stage {
     border: 1px solid rgba(26, 28, 34, 0.35);
     background-color: rgba(119, 127, 151, 0.45); }
   .notification-button:focus, .notification-icon-button:focus, .modal-dialog-button-box .modal-dialog-button:focus {
-    color: #5294E2; }
+    color: #5294e2; }
   .notification-button:active, .notification-icon-button:active, .modal-dialog-button-box .modal-dialog-button:active {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
-    border: 1px solid #5294E2;
-    background-color: #5294E2; }
+    border: 1px solid #5294e2;
+    background-color: #5294e2; }
   .notification-button:insensitive, .notification-icon-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #5d626e;
@@ -79,7 +79,7 @@ stage {
 .popup-menu #notification StEntry, #menu-search-entry {
   padding: 7px;
   caret-size: 1px;
-  selection-background-color: #5294E2;
+  selection-background-color: #5294e2;
   selected-color: #ffffff;
   transition-duration: 300ms;
   border-radius: 3px;
@@ -90,7 +90,7 @@ stage {
   .popup-menu #notification StEntry:focus, #menu-search-entry:focus, .popup-menu #notification StEntry:hover, #menu-search-entry:hover {
     color: #D3DAE3;
     background-color: #404552;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(64, 69, 82, 0.05); }
   .popup-menu #notification StEntry:insensitive, #menu-search-entry:insensitive {
     color: rgba(211, 218, 227, 0.45);
@@ -106,7 +106,7 @@ stage {
   padding: 7px;
   caret-size: 1px;
   caret-color: #BAC3CF;
-  selection-background-color: #5294E2;
+  selection-background-color: #5294e2;
   selected-color: #ffffff;
   transition-duration: 300ms;
   border-radius: 3px;
@@ -116,8 +116,8 @@ stage {
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .notification StEntry:focus {
     color: #ffffff;
-    background-color: #5294E2;
-    border: 1px solid #5294E2;
+    background-color: #5294e2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .notification StEntry:insensitive {
     color: rgba(186, 195, 207, 0.55);
@@ -147,7 +147,7 @@ StScrollBar {
     StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover {
       background-color: #676b78; }
     StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
-      background-color: #5294E2; }
+      background-color: #5294e2; }
 
 .separator {
   -gradient-height: 1px;
@@ -161,7 +161,7 @@ StScrollBar {
   -slider-height: 4px;
   -slider-background-color: #2b2e39;
   -slider-border-color: transparent;
-  -slider-active-background-color: #5294E2;
+  -slider-active-background-color: #5294e2;
   -slider-active-border-color: transparent;
   -slider-border-width: 0;
   -slider-handle-radius: 4px;
@@ -359,7 +359,7 @@ StScrollBar {
       background-gradient-end: rgba(0, 255, 0, 0.2); }
 
 .panel-top, .panel-bottom {
-  color: #ffffff;
+  color: white;
   font-size: 1em;
   padding: 0px; }
 
@@ -401,9 +401,9 @@ StScrollBar {
   padding: 5px 8px;
   -cinnamon-caption-spacing: 4px; }
   .window-caption#selected {
-    background-color: #5294E2;
+    background-color: #5294e2;
     color: #ffffff;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     spacing: 25px; }
 
 .expo-workspaces-name-entry,
@@ -419,20 +419,20 @@ StScrollBar {
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .expo-workspaces-name-entry:focus,
   .expo-workspaces-name-entry#selected:focus {
-    border: 1px solid #5294E2;
-    background-color: #5294E2;
+    border: 1px solid #5294e2;
+    background-color: #5294e2;
     color: #ffffff;
     font-style: italic;
     transition-duration: 300;
     selection-background-color: #ffffff;
-    selected-color: #5294E2; }
+    selected-color: #5294e2; }
 
 .expo-workspace-thumbnail-frame {
   border: 4px solid rgba(255, 255, 255, 0);
   background-color: rgba(255, 255, 255, 0);
   border-radius: 2px; }
   .expo-workspace-thumbnail-frame#active {
-    border: 4px solid #5294E2;
+    border: 4px solid #5294e2;
     background-color: black;
     border-radius: 2px; }
 
@@ -605,7 +605,7 @@ StScrollBar {
 .calendar-today:hover {
   font-weight: bold;
   color: #ffffff;
-  background-color: #5294E2;
+  background-color: #5294e2;
   border-width: 0; }
 
 .calendar-other-month-day {
@@ -672,11 +672,11 @@ StScrollBar {
     border-radius: 2px; }
     .switcher-list .item-box:outlined {
       padding: 8px;
-      border: 1px solid #5294E2; }
+      border: 1px solid #5294e2; }
     .switcher-list .item-box:selected {
       color: #ffffff;
-      background-color: #5294E2;
-      border: 0px solid #5294E2; }
+      background-color: #5294e2;
+      border: 0px solid #5294e2; }
   .switcher-list .thumbnail {
     width: 256px; }
   .switcher-list .thumbnail-box {
@@ -691,7 +691,7 @@ StScrollBar {
   color: #BAC3CF; }
   .switcher-arrow:highlighted {
     border-color: transparent;
-    color: #ffffff; }
+    color: white; }
 
 .thumbnail-scroll-gradient-left {
   background-color: transparent;
@@ -763,15 +763,15 @@ StScrollBar {
     border-radius: 3px;
     caret-color: #BAC3CF;
     selected-color: #ffffff;
-    selection-background-color: #5294E2;
+    selection-background-color: #5294e2;
     color: #BAC3CF;
     background-color: rgba(102, 109, 132, 0.35);
     border: 1px solid rgba(26, 28, 34, 0.35);
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
     .run-dialog-entry:focus {
       color: #ffffff;
-      background-color: #5294E2;
-      border: 1px solid #5294E2;
+      background-color: #5294e2;
+      border: 1px solid #5294e2;
       box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .run-dialog .modal-dialog-button-box {
     border: none;
@@ -866,8 +866,8 @@ StScrollBar {
   .keyboard-key:active, .keyboard-key:checked {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #ffffff;
-    border: 1px solid #5294E2;
-    background-color: #5294E2; }
+    border: 1px solid #5294e2;
+    background-color: #5294e2; }
   .keyboard-key:grayed {
     text-shadow: 0 1px rgba(64, 69, 82, 0);
     color: #5d626e;
@@ -978,7 +978,7 @@ StScrollBar {
   font-weight: bold;
   spacing: 1em;
   padding: 16px;
-  color: #ffffff;
+  color: white;
   border-image: url("common-assets/misc/osd.svg") 9 9 9 9; }
 
 .osd-window {
@@ -989,7 +989,7 @@ StScrollBar {
   margin: 32px;
   min-width: 64px;
   min-height: 64px;
-  color: #ffffff;
+  color: white;
   background: none;
   border: none;
   border-radius: 5px;
@@ -1001,7 +1001,7 @@ StScrollBar {
     height: 4px;
     background-color: rgba(0, 0, 0, 0.5);
     border-radius: 2px;
-    color: #5294E2; }
+    color: #5294e2; }
 
 .window-list-box {
   spacing: 6px;
@@ -1024,9 +1024,9 @@ StScrollBar {
   transition-duration: 100;
   color: rgba(255, 255, 255, 0.6); }
   .window-list-item-box:hover {
-    color: #ffffff; }
+    color: white; }
   .window-list-item-box:active, .window-list-item-box:checked, .window-list-item-box:focus {
-    color: #ffffff; }
+    color: white; }
     .panel-bottom .window-list-item-box:active, .panel-bottom .window-list-item-box:checked, .panel-bottom .window-list-item-box:focus {
       border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; }
     .panel-top .window-list-item-box:active, .panel-top .window-list-item-box:checked, .panel-top .window-list-item-box:focus {
@@ -1122,9 +1122,9 @@ StScrollBar {
       .sound-player-overlay StButton:active {
         text-shadow: 0 1px rgba(64, 69, 82, 0);
         color: #ffffff;
-        background-color: #5294E2;
-        border: 1px solid #5294E2;
-        box-shadow: inset 0 2px 4px #5294E2; }
+        background-color: #5294e2;
+        border: 1px solid #5294e2;
+        box-shadow: inset 0 2px 4px #5294e2; }
     .sound-player-overlay StBoxLayout {
       padding-top: 2px; }
   .sound-player .slider {
@@ -1134,7 +1134,7 @@ StScrollBar {
     -slider-height: 0.5em;
     -slider-background-color: #2d303b;
     -slider-border-color: transparent;
-    -slider-active-background-color: #5294E2;
+    -slider-active-background-color: #5294e2;
     -slider-active-border-color: transparent;
     -slider-border-width: 0px;
     -slider-handle-radius: 0px; }
@@ -1156,7 +1156,7 @@ StScrollBar {
   padding-top: 4px;
   transition-duration: 300; }
   .workspace-button:outlined, .workspace-button:outlined:hover {
-    color: #5294E2; }
+    color: #5294e2; }
   .workspace-button:hover {
     color: rgba(82, 148, 226, 0.5); }
 
@@ -1171,7 +1171,7 @@ StScrollBar {
   background-color: rgba(0, 0, 0, 0.2); }
 
 .workspace-graph .workspace:active {
-  border: 1px solid #5294E2;
+  border: 1px solid #5294e2;
   background-gradient-direction: none; }
 
 .workspace-graph .workspace .windows {
@@ -1195,7 +1195,7 @@ StScrollBar {
   transition-duration: 200; }
   .panel-launcher:hover {
     background-gradient-direction: none;
-    border: 0px solid #5294E2; }
+    border: 0px solid #5294e2; }
     .panel-bottom .panel-launcher:hover {
       border-bottom-width: 1px; }
     .panel-top .panel-launcher:hover {
@@ -1216,22 +1216,22 @@ StScrollBar {
 .applet-box {
   padding-left: 3px;
   padding-right: 3px;
-  color: #ffffff;
+  color: white;
   text-shadow: none;
   transition-duration: 100; }
   .applet-box:hover {
     color: #ffffff;
-    background-color: #5294E2; }
+    background-color: #5294e2; }
 
 .applet-label {
   font-weight: bold;
-  color: #ffffff; }
+  color: white; }
   .applet-label:hover, .applet-box:hover > .applet-label {
     color: #ffffff;
     text-shadow: none; }
 
 .applet-icon {
-  color: #ffffff;
+  color: white;
   icon-size: 22px; }
   .applet-icon:hover, .applet-box:hover > .applet-icon {
     color: #ffffff;
@@ -1272,7 +1272,7 @@ StScrollBar {
     padding: 12px;
     padding-bottom: 6px; }
   .desklet-drag-placeholder {
-    border: 2px solid #5294E2;
+    border: 2px solid #5294e2;
     background-color: rgba(82, 148, 226, 0.3); }
 
 .photoframe-box {
@@ -1297,7 +1297,7 @@ StScrollBar {
 .tile-preview, .tile-preview.snap,
 .tile-hud, .tile-hud.snap {
   background-color: rgba(82, 148, 226, 0.3);
-  border: 1px solid #5294E2; }
+  border: 1px solid #5294e2; }
 
 .xkcd-box {
   padding: 6px;
diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css
index 6aaee78..5ea0a46 100644
--- a/common/cinnamon/cinnamon.css
+++ b/common/cinnamon/cinnamon.css
@@ -22,7 +22,7 @@ stage {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fbfbfc;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
   .popup-menu #notification .notification-button:hover, .popup-menu #notification .notification-icon-button:hover, .menu-favorites-button:hover, .menu-application-button-selected, .menu-category-button-selected, .sound-button:hover {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
@@ -34,14 +34,14 @@ stage {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5c616c;
     background-color: #fbfbfc;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(251, 251, 252, 0.05); }
   .popup-menu #notification .notification-button:active, .popup-menu #notification .notification-icon-button:active, .sound-button:active, .popup-menu #notification .notification-button:active:focus, .popup-menu #notification .notification-icon-button:active:focus, .sound-button:active:focus {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #ffffff;
-    background-color: #5294E2;
-    border: 1px solid #5294E2;
-    box-shadow: inset 0 2px 4px #5294E2; }
+    background-color: #5294e2;
+    border: 1px solid #5294e2;
+    box-shadow: inset 0 2px 4px #5294e2; }
   .popup-menu #notification .notification-button:insensitive, .popup-menu #notification .notification-icon-button:insensitive, .sound-button:insensitive {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: rgba(92, 97, 108, 0.55);
@@ -64,12 +64,12 @@ stage {
     border: 1px solid rgba(26, 28, 34, 0.35);
     background-color: rgba(119, 127, 151, 0.45); }
   .notification-button:focus, .notification-icon-button:focus, .modal-dialog-button-box .modal-dialog-button:focus {
-    color: #5294E2; }
+    color: #5294e2; }
   .notification-button:active, .notification-icon-button:active, .modal-dialog-button-box .modal-dialog-button:active {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #ffffff;
-    border: 1px solid #5294E2;
-    background-color: #5294E2; }
+    border: 1px solid #5294e2;
+    background-color: #5294e2; }
   .notification-button:insensitive, .notification-icon-button:insensitive, .modal-dialog-button-box .modal-dialog-button:insensitive {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5d626e;
@@ -79,7 +79,7 @@ stage {
 .popup-menu #notification StEntry, #menu-search-entry {
   padding: 7px;
   caret-size: 1px;
-  selection-background-color: #5294E2;
+  selection-background-color: #5294e2;
   selected-color: #ffffff;
   transition-duration: 300ms;
   border-radius: 3px;
@@ -90,7 +90,7 @@ stage {
   .popup-menu #notification StEntry:focus, #menu-search-entry:focus, .popup-menu #notification StEntry:hover, #menu-search-entry:hover {
     color: #5c616c;
     background-color: #ffffff;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(255, 255, 255, 0.05); }
   .popup-menu #notification StEntry:insensitive, #menu-search-entry:insensitive {
     color: rgba(92, 97, 108, 0.55);
@@ -106,7 +106,7 @@ stage {
   padding: 7px;
   caret-size: 1px;
   caret-color: #BAC3CF;
-  selection-background-color: #5294E2;
+  selection-background-color: #5294e2;
   selected-color: #ffffff;
   transition-duration: 300ms;
   border-radius: 3px;
@@ -116,8 +116,8 @@ stage {
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .notification StEntry:focus {
     color: #ffffff;
-    background-color: #5294E2;
-    border: 1px solid #5294E2;
+    background-color: #5294e2;
+    border: 1px solid #5294e2;
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .notification StEntry:insensitive {
     color: rgba(186, 195, 207, 0.55);
@@ -147,7 +147,7 @@ StScrollBar {
     StScrollBar StButton#vhandle:hover, StScrollBar StButton#hhandle:hover {
       background-color: #c7c9cd; }
     StScrollBar StButton#vhandle:active, StScrollBar StButton#hhandle:active {
-      background-color: #5294E2; }
+      background-color: #5294e2; }
 
 .separator {
   -gradient-height: 1px;
@@ -161,7 +161,7 @@ StScrollBar {
   -slider-height: 4px;
   -slider-background-color: #cfd6e6;
   -slider-border-color: transparent;
-  -slider-active-background-color: #5294E2;
+  -slider-active-background-color: #5294e2;
   -slider-active-border-color: transparent;
   -slider-border-width: 0;
   -slider-handle-radius: 4px;
@@ -359,7 +359,7 @@ StScrollBar {
       background-gradient-end: rgba(0, 255, 0, 0.2); }
 
 .panel-top, .panel-bottom {
-  color: #ffffff;
+  color: white;
   font-size: 1em;
   padding: 0px; }
 
@@ -401,9 +401,9 @@ StScrollBar {
   padding: 5px 8px;
   -cinnamon-caption-spacing: 4px; }
   .window-caption#selected {
-    background-color: #5294E2;
+    background-color: #5294e2;
     color: #ffffff;
-    border: 1px solid #5294E2;
+    border: 1px solid #5294e2;
     spacing: 25px; }
 
 .expo-workspaces-name-entry,
@@ -419,20 +419,20 @@ StScrollBar {
   box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .expo-workspaces-name-entry:focus,
   .expo-workspaces-name-entry#selected:focus {
-    border: 1px solid #5294E2;
-    background-color: #5294E2;
+    border: 1px solid #5294e2;
+    background-color: #5294e2;
     color: #ffffff;
     font-style: italic;
     transition-duration: 300;
     selection-background-color: #ffffff;
-    selected-color: #5294E2; }
+    selected-color: #5294e2; }
 
 .expo-workspace-thumbnail-frame {
   border: 4px solid rgba(255, 255, 255, 0);
   background-color: rgba(255, 255, 255, 0);
   border-radius: 2px; }
   .expo-workspace-thumbnail-frame#active {
-    border: 4px solid #5294E2;
+    border: 4px solid #5294e2;
     background-color: black;
     border-radius: 2px; }
 
@@ -605,7 +605,7 @@ StScrollBar {
 .calendar-today:hover {
   font-weight: bold;
   color: #ffffff;
-  background-color: #5294E2;
+  background-color: #5294e2;
   border-width: 0; }
 
 .calendar-other-month-day {
@@ -672,11 +672,11 @@ StScrollBar {
     border-radius: 2px; }
     .switcher-list .item-box:outlined {
       padding: 8px;
-      border: 1px solid #5294E2; }
+      border: 1px solid #5294e2; }
     .switcher-list .item-box:selected {
       color: #ffffff;
-      background-color: #5294E2;
-      border: 0px solid #5294E2; }
+      background-color: #5294e2;
+      border: 0px solid #5294e2; }
   .switcher-list .thumbnail {
     width: 256px; }
   .switcher-list .thumbnail-box {
@@ -691,7 +691,7 @@ StScrollBar {
   color: #BAC3CF; }
   .switcher-arrow:highlighted {
     border-color: transparent;
-    color: #ffffff; }
+    color: white; }
 
 .thumbnail-scroll-gradient-left {
   background-color: transparent;
@@ -763,15 +763,15 @@ StScrollBar {
     border-radius: 3px;
     caret-color: #BAC3CF;
     selected-color: #ffffff;
-    selection-background-color: #5294E2;
+    selection-background-color: #5294e2;
     color: #BAC3CF;
     background-color: rgba(102, 109, 132, 0.35);
     border: 1px solid rgba(26, 28, 34, 0.35);
     box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
     .run-dialog-entry:focus {
       color: #ffffff;
-      background-color: #5294E2;
-      border: 1px solid #5294E2;
+      background-color: #5294e2;
+      border: 1px solid #5294e2;
       box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.05); }
   .run-dialog .modal-dialog-button-box {
     border: none;
@@ -866,8 +866,8 @@ StScrollBar {
   .keyboard-key:active, .keyboard-key:checked {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #ffffff;
-    border: 1px solid #5294E2;
-    background-color: #5294E2; }
+    border: 1px solid #5294e2;
+    background-color: #5294e2; }
   .keyboard-key:grayed {
     text-shadow: 0 1px rgba(255, 255, 255, 0);
     color: #5d626e;
@@ -978,7 +978,7 @@ StScrollBar {
   font-weight: bold;
   spacing: 1em;
   padding: 16px;
-  color: #ffffff;
+  color: white;
   border-image: url("common-assets/misc/osd.svg") 9 9 9 9; }
 
 .osd-window {
@@ -989,7 +989,7 @@ StScrollBar {
   margin: 32px;
   min-width: 64px;
   min-height: 64px;
-  color: #ffffff;
+  color: white;
   background: none;
   border: none;
   border-radius: 5px;
@@ -1001,7 +1001,7 @@ StScrollBar {
     height: 4px;
     background-color: rgba(0, 0, 0, 0.5);
     border-radius: 2px;
-    color: #5294E2; }
+    color: #5294e2; }
 
 .window-list-box {
   spacing: 6px;
@@ -1024,9 +1024,9 @@ StScrollBar {
   transition-duration: 100;
   color: rgba(255, 255, 255, 0.6); }
   .window-list-item-box:hover {
-    color: #ffffff; }
+    color: white; }
   .window-list-item-box:active, .window-list-item-box:checked, .window-list-item-box:focus {
-    color: #ffffff; }
+    color: white; }
     .panel-bottom .window-list-item-box:active, .panel-bottom .window-list-item-box:checked, .panel-bottom .window-list-item-box:focus {
       border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; }
     .panel-top .window-list-item-box:active, .panel-top .window-list-item-box:checked, .panel-top .window-list-item-box:focus {
@@ -1122,9 +1122,9 @@ StScrollBar {
       .sound-player-overlay StButton:active {
         text-shadow: 0 1px rgba(255, 255, 255, 0);
         color: #ffffff;
-        background-color: #5294E2;
-        border: 1px solid #5294E2;
-        box-shadow: inset 0 2px 4px #5294E2; }
+        background-color: #5294e2;
+        border: 1px solid #5294e2;
+        box-shadow: inset 0 2px 4px #5294e2; }
     .sound-player-overlay StBoxLayout {
       padding-top: 2px; }
   .sound-player .slider {
@@ -1134,7 +1134,7 @@ StScrollBar {
     -slider-height: 0.5em;
     -slider-background-color: #cfd6e6;
     -slider-border-color: transparent;
-    -slider-active-background-color: #5294E2;
+    -slider-active-background-color: #5294e2;
     -slider-active-border-color: transparent;
     -slider-border-width: 0px;
     -slider-handle-radius: 0px; }
@@ -1156,7 +1156,7 @@ StScrollBar {
   padding-top: 4px;
   transition-duration: 300; }
   .workspace-button:outlined, .workspace-button:outlined:hover {
-    color: #5294E2; }
+    color: #5294e2; }
   .workspace-button:hover {
     color: rgba(82, 148, 226, 0.5); }
 
@@ -1171,7 +1171,7 @@ StScrollBar {
   background-color: rgba(0, 0, 0, 0.2); }
 
 .workspace-graph .workspace:active {
-  border: 1px solid #5294E2;
+  border: 1px solid #5294e2;
   background-gradient-direction: none; }
 
 .workspace-graph .workspace .windows {
@@ -1195,7 +1195,7 @@ StScrollBar {
   transition-duration: 200; }
   .panel-launcher:hover {
     background-gradient-direction: none;
-    border: 0px solid #5294E2; }
+    border: 0px solid #5294e2; }
     .panel-bottom .panel-launcher:hover {
       border-bottom-width: 1px; }
     .panel-top .panel-launcher:hover {
@@ -1216,22 +1216,22 @@ StScrollBar {
 .applet-box {
   padding-left: 3px;
   padding-right: 3px;
-  color: #ffffff;
+  color: white;
   text-shadow: none;
   transition-duration: 100; }
   .applet-box:hover {
     color: #ffffff;
-    background-color: #5294E2; }
+    background-color: #5294e2; }
 
 .applet-label {
   font-weight: bold;
-  color: #ffffff; }
+  color: white; }
   .applet-label:hover, .applet-box:hover > .applet-label {
     color: #ffffff;
     text-shadow: none; }
 
 .applet-icon {
-  color: #ffffff;
+  color: white;
   icon-size: 22px; }
   .applet-icon:hover, .applet-box:hover > .applet-icon {
     color: #ffffff;
@@ -1272,7 +1272,7 @@ StScrollBar {
     padding: 12px;
     padding-bottom: 6px; }
   .desklet-drag-placeholder {
-    border: 2px solid #5294E2;
+    border: 2px solid #5294e2;
     background-color: rgba(82, 148, 226, 0.3); }
 
 .photoframe-box {
@@ -1297,7 +1297,7 @@ StScrollBar {
 .tile-preview, .tile-preview.snap,
 .tile-hud, .tile-hud.snap {
   background-color: rgba(82, 148, 226, 0.3);
-  border: 1px solid #5294E2; }
+  border: 1px solid #5294e2; }
 
 .xkcd-box {
   padding: 6px;
diff --git a/common/cinnamon/sass/_colors.scss b/common/cinnamon/sass/_colors.scss
index 47daa0f..8d3a5f2 100644
--- a/common/cinnamon/sass/_colors.scss
+++ b/common/cinnamon/sass/_colors.scss
@@ -8,7 +8,7 @@ $bg_color: if($variant =='light', #F5F6F7, #383C4A);
 $fg_color: if($variant =='light', #5c616c, #D3DAE3);
 
 $selected_fg_color: #ffffff;
-$selected_bg_color: #5294E2;
+$selected_bg_color: #5294e2;
 $selected_borders_color: darken($selected_bg_color, 20%);
 $borders_color: if($variant =='light', darken($bg_color,9%), darken($bg_color,6%));
 
@@ -18,11 +18,18 @@ $link_visited_color: if($variant == 'light', darken($selected_bg_color,20%),
                                      lighten($selected_bg_color,10%));
 
 $selection_mode_bg: if($transparency == 'true', transparentize($selected_bg_color, 0.05), $selected_bg_color);
+$selection_mode_fg: $selected_fg_color;
 $warning_color: #F27835;
 $error_color: #FC4138;
+$warning_fg_color: white;
+$error_fg_color: white;
 $success_color: #73d216;
 $destructive_color: #F04A50;
 $suggested_color: #4DADD4;
+$destructive_fg_color: white;
+$suggested_fg_color: white;
+
+$drop_target_color: #F08437;
 
 //insensitive state derived colors
 $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55));
diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss
index c1788b0..73c0529 100644
--- a/common/cinnamon/sass/_common.scss
+++ b/common/cinnamon/sass/_common.scss
@@ -8,6 +8,7 @@ $font-family: Futura Bk bt, sans, Sans-Serif;
 $_bubble_bg_color: opacify($osd_bg_color,0.25);
 $_bubble_fg_color: $osd_fg_color;
 $_bubble_borders_color: transparentize($osd_fg_color,0.8);
+$_shell_fg_color: white;
 
 stage {
   font-family: $font-family;
@@ -397,9 +398,10 @@ StScrollBar {
 }
 
 .panel {
+  $_panel_fg_color: $_shell_fg_color;
 
   &-top, &-bottom {
-    color: $selected_fg_color;
+    color: $_panel_fg_color;
     font-size: 1em;
     padding: 0px;
   }
@@ -833,7 +835,7 @@ StScrollBar {
 
   &:highlighted {
     border-color: rgba(0,0,0,0);
-    color: $selected_fg_color;
+    color: $_shell_fg_color;
   }
 }
 
@@ -1186,7 +1188,7 @@ StScrollBar {
   font-weight: bold;
   spacing: 1em;
   padding: 16px;
-  color: $selected_fg_color;
+  color: $_shell_fg_color;
   border-image: url("common-assets/misc/osd.svg") 9 9 9 9;
 }
 
@@ -1199,7 +1201,7 @@ StScrollBar {
   min-width: 64px;
   min-height: 64px;
 
-  color: $selected_fg_color;
+  color: $_shell_fg_color;
   background: none;
   border: none;
   border-radius: 5px;
@@ -1241,14 +1243,14 @@ StScrollBar {
     padding-left: 8px;
     padding-right: 8px;
     transition-duration: 100;
-    color: transparentize($selected_fg_color, 0.4);
+    color: transparentize($_shell_fg_color, 0.4);
 
-    &:hover {color: $selected_fg_color;}
+    &:hover {color: $_shell_fg_color;}
 
     &:active,
     &:checked,
     &:focus {
-      color: $selected_fg_color;
+      color: $_shell_fg_color;
 
       .panel-bottom & { border-image: url("common-assets/panel/window-list-active-bottom.svg") 3 3 1 3; }
 
@@ -1485,7 +1487,7 @@ StScrollBar {
   &-box {
     padding-left: 3px;
     padding-right: 3px;
-    color: $selected_fg_color;
+    color: $_shell_fg_color;
     text-shadow: none;
     transition-duration: 100;
 
@@ -1497,7 +1499,7 @@ StScrollBar {
 
   &-label {
     font-weight: bold;
-    color: $selected_fg_color;
+    color: $_shell_fg_color;
 
     &:hover, .applet-box:hover > & {
       color: $selected_fg_color;
@@ -1506,7 +1508,7 @@ StScrollBar {
   }
 
   &-icon {
-    color: $selected_fg_color;
+    color: $_shell_fg_color;
     icon-size: 22px;
 
     &:hover, .applet-box:hover > & {
-- 
cgit v1.2.3


From 28dfc77210aa27314ac545a225586220d7078adf Mon Sep 17 00:00:00 2001
From: Horst3180
Date: Wed, 14 Sep 2016 12:17:35 +0200
Subject: cinnamon: add proper popup-combo-menu styling (#634)

---
 common/cinnamon/cinnamon-dark.css | 34 +++++++++++++++-------------------
 common/cinnamon/cinnamon.css      | 34 +++++++++++++++-------------------
 common/cinnamon/sass/_common.scss | 11 ++++-------
 3 files changed, 34 insertions(+), 45 deletions(-)

(limited to 'common/cinnamon')

diff --git a/common/cinnamon/cinnamon-dark.css b/common/cinnamon/cinnamon-dark.css
index 2da56b1..4531658 100644
--- a/common/cinnamon/cinnamon-dark.css
+++ b/common/cinnamon/cinnamon-dark.css
@@ -249,42 +249,43 @@ StScrollBar {
   font-weight: normal;
   text-align: center; }
 
-.popup-menu {
+.popup-menu,
+.popup-combo-menu {
   color: white;
   min-width: 200px;
   color: #D3DAE3;
   border-image: url("dark-assets/menu/menu.svg") 9 9 9 9; }
   .popup-menu-arrow {
     icon-size: 16px; }
-  .popup-menu .popup-sub-menu {
+  .popup-menu .popup-sub-menu, .popup-combo-menu .popup-sub-menu {
     background-gradient-direction: none;
     box-shadow: none;
     border-image: url("dark-assets/menu/submenu.svg") 9 9 9 9; }
-    .popup-menu .popup-sub-menu .popup-menu-item:ltr {
+    .popup-menu .popup-sub-menu .popup-menu-item:ltr, .popup-combo-menu .popup-sub-menu .popup-menu-item:ltr {
       padding-right: 0em; }
-    .popup-menu .popup-sub-menu .popup-menu-item:rtl {
+    .popup-menu .popup-sub-menu .popup-menu-item:rtl, .popup-combo-menu .popup-sub-menu .popup-menu-item:rtl {
       padding-left: 0em; }
-    .popup-menu .popup-sub-menu StScrollBar {
+    .popup-menu .popup-sub-menu StScrollBar, .popup-combo-menu .popup-sub-menu StScrollBar {
       padding: 4px; }
-      .popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle {
+      .popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle, .popup-combo-menu .popup-sub-menu StScrollBar StBin#trough, .popup-combo-menu .popup-sub-menu StScrollBar StBin#vhandle {
         border-width: 0; }
-  .popup-menu .popup-menu-content {
+  .popup-menu .popup-menu-content, .popup-combo-menu .popup-menu-content {
     padding: 1em 0em 1em 0em; }
-  .popup-menu .popup-menu-item {
+  .popup-menu .popup-menu-item, .popup-combo-menu .popup-menu-item {
     padding: .4em 1.75em;
     spacing: 1em; }
-    .popup-menu .popup-menu-item:active {
+    .popup-menu .popup-menu-item:active, .popup-combo-menu .popup-menu-item:active {
       color: #ffffff;
       background-color: transparent;
       border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; }
-    .popup-menu .popup-menu-item:insensitive {
+    .popup-menu .popup-menu-item:insensitive, .popup-combo-menu .popup-menu-item:insensitive {
       color: rgba(211, 218, 227, 0.5);
       background: none; }
-  .popup-menu .popup-inactive-menu-item {
+  .popup-menu .popup-inactive-menu-item, .popup-combo-menu .popup-inactive-menu-item {
     color: #D3DAE3; }
-    .popup-menu .popup-inactive-menu-item:insensitive {
+    .popup-menu .popup-inactive-menu-item:insensitive, .popup-combo-menu .popup-inactive-menu-item:insensitive {
       color: rgba(211, 218, 227, 0.45); }
-  .popup-menu .popup-menu-item:active .popup-inactive-menu-item {
+  .popup-menu .popup-menu-item:active .popup-inactive-menu-item, .popup-combo-menu .popup-menu-item:active .popup-inactive-menu-item {
     color: #ffffff; }
   .popup-menu-icon {
     icon-size: 16px; }
@@ -297,13 +298,8 @@ StScrollBar {
   -arrow-base: 0;
   -arrow-rise: 0; }
 
-/*Don't know what this does*/
 .popup-combo-menu {
-  background-color: rgba(0, 0, 0, 0.4);
-  padding: 1em 0em;
-  color: red;
-  border: 1px solid rgba(0, 0, 0, 0.6);
-  border-radius: 3px; }
+  padding: 10px 1px; }
 
 .popup-combobox-item {
   spacing: 1em; }
diff --git a/common/cinnamon/cinnamon.css b/common/cinnamon/cinnamon.css
index 5ea0a46..e0ea24a 100644
--- a/common/cinnamon/cinnamon.css
+++ b/common/cinnamon/cinnamon.css
@@ -249,42 +249,43 @@ StScrollBar {
   font-weight: normal;
   text-align: center; }
 
-.popup-menu {
+.popup-menu,
+.popup-combo-menu {
   color: white;
   min-width: 200px;
   color: #5c616c;
   border-image: url("light-assets/menu/menu.svg") 9 9 9 9; }
   .popup-menu-arrow {
     icon-size: 16px; }
-  .popup-menu .popup-sub-menu {
+  .popup-menu .popup-sub-menu, .popup-combo-menu .popup-sub-menu {
     background-gradient-direction: none;
     box-shadow: none;
     border-image: url("light-assets/menu/submenu.svg") 9 9 9 9; }
-    .popup-menu .popup-sub-menu .popup-menu-item:ltr {
+    .popup-menu .popup-sub-menu .popup-menu-item:ltr, .popup-combo-menu .popup-sub-menu .popup-menu-item:ltr {
       padding-right: 0em; }
-    .popup-menu .popup-sub-menu .popup-menu-item:rtl {
+    .popup-menu .popup-sub-menu .popup-menu-item:rtl, .popup-combo-menu .popup-sub-menu .popup-menu-item:rtl {
       padding-left: 0em; }
-    .popup-menu .popup-sub-menu StScrollBar {
+    .popup-menu .popup-sub-menu StScrollBar, .popup-combo-menu .popup-sub-menu StScrollBar {
       padding: 4px; }
-      .popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle {
+      .popup-menu .popup-sub-menu StScrollBar StBin#trough, .popup-menu .popup-sub-menu StScrollBar StBin#vhandle, .popup-combo-menu .popup-sub-menu StScrollBar StBin#trough, .popup-combo-menu .popup-sub-menu StScrollBar StBin#vhandle {
         border-width: 0; }
-  .popup-menu .popup-menu-content {
+  .popup-menu .popup-menu-content, .popup-combo-menu .popup-menu-content {
     padding: 1em 0em 1em 0em; }
-  .popup-menu .popup-menu-item {
+  .popup-menu .popup-menu-item, .popup-combo-menu .popup-menu-item {
     padding: .4em 1.75em;
     spacing: 1em; }
-    .popup-menu .popup-menu-item:active {
+    .popup-menu .popup-menu-item:active, .popup-combo-menu .popup-menu-item:active {
       color: #ffffff;
       background-color: transparent;
       border-image: url("common-assets/menu/menu-hover.svg") 9 9 1 1; }
-    .popup-menu .popup-menu-item:insensitive {
+    .popup-menu .popup-menu-item:insensitive, .popup-combo-menu .popup-menu-item:insensitive {
       color: rgba(92, 97, 108, 0.5);
       background: none; }
-  .popup-menu .popup-inactive-menu-item {
+  .popup-menu .popup-inactive-menu-item, .popup-combo-menu .popup-inactive-menu-item {
     color: #5c616c; }
-    .popup-menu .popup-inactive-menu-item:insensitive {
+    .popup-menu .popup-inactive-menu-item:insensitive, .popup-combo-menu .popup-inactive-menu-item:insensitive {
       color: rgba(92, 97, 108, 0.55); }
-  .popup-menu .popup-menu-item:active .popup-inactive-menu-item {
+  .popup-menu .popup-menu-item:active .popup-inactive-menu-item, .popup-combo-menu .popup-menu-item:active .popup-inactive-menu-item {
     color: #ffffff; }
   .popup-menu-icon {
     icon-size: 16px; }
@@ -297,13 +298,8 @@ StScrollBar {
   -arrow-base: 0;
   -arrow-rise: 0; }
 
-/*Don't know what this does*/
 .popup-combo-menu {
-  background-color: rgba(0, 0, 0, 0.4);
-  padding: 1em 0em;
-  color: red;
-  border: 1px solid rgba(0, 0, 0, 0.6);
-  border-radius: 3px; }
+  padding: 10px 1px; }
 
 .popup-combobox-item {
   spacing: 1em; }
diff --git a/common/cinnamon/sass/_common.scss b/common/cinnamon/sass/_common.scss
index 73c0529..6760dcc 100644
--- a/common/cinnamon/sass/_common.scss
+++ b/common/cinnamon/sass/_common.scss
@@ -267,7 +267,8 @@ StScrollBar {
 //
 // Popvers/Menus
 //
-.popup-menu {
+.popup-menu,
+%menu {
   color: white;
   min-width: 200px;
   color: $fg_color;
@@ -325,13 +326,9 @@ StScrollBar {
   -arrow-rise: 0;
 }
 
-/*Don't know what this does*/
 .popup-combo-menu {
-  background-color: rgba(0,0,0,0.4);
-  padding: 1em 0em;
-  color: red;
-  border: 1px solid rgba(0,0,0,0.6);
-  border-radius: 3px;
+  @extend %menu;
+  padding: 10px 1px;
 }
 .popup-image-menu-item {}
 
-- 
cgit v1.2.3