changeset 5:749a8ba83a29

Tweak GTK 2 theme for darker styling * Try to fix menus a bit * Make menu hover more like GTK 3 * Edit SVG and regenerate widgets
author IBBoard <dev@ibboard.co.uk>
date Sat, 16 Apr 2016 14:51:05 +0100
parents 146709719b60
children 043c874084ba
files gtk-2.0/Buttons/button-default-nohilight.png gtk-2.0/Buttons/button-default.png gtk-2.0/Buttons/button-insensitive-nohilight.png gtk-2.0/Buttons/button-insensitive.png gtk-2.0/Buttons/button-prelight-nohilight.png gtk-2.0/Buttons/button-prelight.png gtk-2.0/Buttons/button-pressed-nohilight.png gtk-2.0/Buttons/button-pressed.png gtk-2.0/Entry/combo-entry-border-active-rtl.png gtk-2.0/Entry/combo-entry-border-active.png gtk-2.0/Entry/combo-entry-border-disabled-rtl.png gtk-2.0/Entry/combo-entry-border-disabled.png gtk-2.0/Entry/combo-entry-border-rtl.png gtk-2.0/Entry/combo-entry-border.png gtk-2.0/Entry/combo-entry-button-active-rtl.png gtk-2.0/Entry/combo-entry-button-active.png gtk-2.0/Entry/combo-entry-button-disabled-rtl.png gtk-2.0/Entry/combo-entry-button-disabled.png gtk-2.0/Entry/combo-entry-button-rtl.png gtk-2.0/Entry/combo-entry-button.png gtk-2.0/Entry/entry-bg-disabled.png gtk-2.0/Entry/entry-bg.png gtk-2.0/Entry/entry-border-active.png gtk-2.0/Entry/entry-border-disabled.png gtk-2.0/Entry/entry-border.png gtk-2.0/Lines/menu_line_h.png gtk-2.0/Menu-Menubar/menubar_button.png gtk-2.0/ProgressBar/progressbar.png gtk-2.0/ProgressBar/progressbar_v.png gtk-2.0/ProgressBar/trough-progressbar.png gtk-2.0/ProgressBar/trough-progressbar_v.png gtk-2.0/Scrollbars/trough-scrollbar-vert.png gtk-2.0/Spin/down-background-disable-notebook-rtl.png gtk-2.0/Spin/down-background-disable-notebook.png gtk-2.0/Spin/down-background-disable-rtl.png gtk-2.0/Spin/down-background-disable.png gtk-2.0/Spin/down-background-notebook-rtl.png gtk-2.0/Spin/down-background-notebook.png gtk-2.0/Spin/down-background-rtl.png gtk-2.0/Spin/down-background.png gtk-2.0/Spin/up-background-disable-notebook-rtl.png gtk-2.0/Spin/up-background-disable-notebook.png gtk-2.0/Spin/up-background-disable-rtl.png gtk-2.0/Spin/up-background-disable.png gtk-2.0/Spin/up-background-notebook-rtl.png gtk-2.0/Spin/up-background-notebook.png gtk-2.0/Spin/up-background-rtl.png gtk-2.0/Spin/up-background.png gtk-2.0/Tabs/notebook-gap-horiz.png gtk-2.0/Tabs/notebook-gap-vert.png gtk-2.0/Tabs/notebook.png gtk-2.0/Tabs/tab-bottom-active.png gtk-2.0/Tabs/tab-bottom.png gtk-2.0/Tabs/tab-top-active.png gtk-2.0/Tabs/tab-top.png gtk-2.0/adwaita-bits.svg gtk-2.0/gtkrc
diffstat 57 files changed, 120 insertions(+), 661 deletions(-) [+]
line wrap: on
line diff
Binary file gtk-2.0/Buttons/button-default-nohilight.png has changed
Binary file gtk-2.0/Buttons/button-default.png has changed
Binary file gtk-2.0/Buttons/button-insensitive-nohilight.png has changed
Binary file gtk-2.0/Buttons/button-insensitive.png has changed
Binary file gtk-2.0/Buttons/button-prelight-nohilight.png has changed
Binary file gtk-2.0/Buttons/button-prelight.png has changed
Binary file gtk-2.0/Buttons/button-pressed-nohilight.png has changed
Binary file gtk-2.0/Buttons/button-pressed.png has changed
Binary file gtk-2.0/Entry/combo-entry-border-active-rtl.png has changed
Binary file gtk-2.0/Entry/combo-entry-border-active.png has changed
Binary file gtk-2.0/Entry/combo-entry-border-disabled-rtl.png has changed
Binary file gtk-2.0/Entry/combo-entry-border-disabled.png has changed
Binary file gtk-2.0/Entry/combo-entry-border-rtl.png has changed
Binary file gtk-2.0/Entry/combo-entry-border.png has changed
Binary file gtk-2.0/Entry/combo-entry-button-active-rtl.png has changed
Binary file gtk-2.0/Entry/combo-entry-button-active.png has changed
Binary file gtk-2.0/Entry/combo-entry-button-disabled-rtl.png has changed
Binary file gtk-2.0/Entry/combo-entry-button-disabled.png has changed
Binary file gtk-2.0/Entry/combo-entry-button-rtl.png has changed
Binary file gtk-2.0/Entry/combo-entry-button.png has changed
Binary file gtk-2.0/Entry/entry-bg-disabled.png has changed
Binary file gtk-2.0/Entry/entry-bg.png has changed
Binary file gtk-2.0/Entry/entry-border-active.png has changed
Binary file gtk-2.0/Entry/entry-border-disabled.png has changed
Binary file gtk-2.0/Entry/entry-border.png has changed
Binary file gtk-2.0/Lines/menu_line_h.png has changed
Binary file gtk-2.0/Menu-Menubar/menubar_button.png has changed
Binary file gtk-2.0/ProgressBar/progressbar.png has changed
Binary file gtk-2.0/ProgressBar/progressbar_v.png has changed
Binary file gtk-2.0/ProgressBar/trough-progressbar.png has changed
Binary file gtk-2.0/ProgressBar/trough-progressbar_v.png has changed
Binary file gtk-2.0/Scrollbars/trough-scrollbar-vert.png has changed
Binary file gtk-2.0/Spin/down-background-disable-notebook-rtl.png has changed
Binary file gtk-2.0/Spin/down-background-disable-notebook.png has changed
Binary file gtk-2.0/Spin/down-background-disable-rtl.png has changed
Binary file gtk-2.0/Spin/down-background-disable.png has changed
Binary file gtk-2.0/Spin/down-background-notebook-rtl.png has changed
Binary file gtk-2.0/Spin/down-background-notebook.png has changed
Binary file gtk-2.0/Spin/down-background-rtl.png has changed
Binary file gtk-2.0/Spin/down-background.png has changed
Binary file gtk-2.0/Spin/up-background-disable-notebook-rtl.png has changed
Binary file gtk-2.0/Spin/up-background-disable-notebook.png has changed
Binary file gtk-2.0/Spin/up-background-disable-rtl.png has changed
Binary file gtk-2.0/Spin/up-background-disable.png has changed
Binary file gtk-2.0/Spin/up-background-notebook-rtl.png has changed
Binary file gtk-2.0/Spin/up-background-notebook.png has changed
Binary file gtk-2.0/Spin/up-background-rtl.png has changed
Binary file gtk-2.0/Spin/up-background.png has changed
Binary file gtk-2.0/Tabs/notebook-gap-horiz.png has changed
Binary file gtk-2.0/Tabs/notebook-gap-vert.png has changed
Binary file gtk-2.0/Tabs/notebook.png has changed
Binary file gtk-2.0/Tabs/tab-bottom-active.png has changed
Binary file gtk-2.0/Tabs/tab-bottom.png has changed
Binary file gtk-2.0/Tabs/tab-top-active.png has changed
Binary file gtk-2.0/Tabs/tab-top.png has changed
--- a/gtk-2.0/adwaita-bits.svg	Sat Apr 09 21:13:42 2016 +0100
+++ b/gtk-2.0/adwaita-bits.svg	Sat Apr 16 14:51:05 2016 +0100
@@ -14,19 +14,30 @@
    height="480px"
    id="svg3032"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.91 r13725"
    sodipodi:docname="adwaita-bits.svg">
   <defs
      id="defs3034">
     <linearGradient
+       id="linearGradient4708">
+      <stop
+         id="stop4710"
+         offset="0"
+         style="stop-color:#ededed;stop-opacity:1" />
+      <stop
+         id="stop4712"
+         offset="1"
+         style="stop-color:#ededed;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
        inkscape:collect="always"
        id="linearGradient4261">
       <stop
-         style="stop-color:#e0e0e0;stop-opacity:1"
+         style="stop-color:#b9b9b9;stop-opacity:1"
          offset="0"
          id="stop4263" />
       <stop
-         style="stop-color:#a7aba7;stop-opacity:1"
+         style="stop-color:#b0b0b0;stop-opacity:1"
          offset="1"
          id="stop4265" />
     </linearGradient>
@@ -36,28 +47,28 @@
       <stop
          id="stop4118"
          offset="0"
-         style="stop-color:#ebebeb;stop-opacity:1" />
+         style="stop-color:#c6c6c6;stop-opacity:1" />
       <stop
          id="stop4120"
          offset="1"
-         style="stop-color:#ffffff;stop-opacity:1" />
+         style="stop-color:#e7e7e7;stop-opacity:1" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
        id="linearGradient3919">
       <stop
-         style="stop-color:#dbdbdb;stop-opacity:1"
+         style="stop-color:#b9b9b9;stop-opacity:1"
          offset="0"
          id="stop3921" />
       <stop
-         style="stop-color:#f7f7f7;stop-opacity:1"
+         style="stop-color:#d1d1d1;stop-opacity:1"
          offset="1"
          id="stop3923" />
     </linearGradient>
     <linearGradient
        id="linearGradient3837">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         style="stop-color:#ffffff;stop-opacity:0.78431374"
          offset="0"
          id="stop3839" />
       <stop
@@ -67,28 +78,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3845">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845"
-       id="linearGradient4043"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,0.46428562)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3837"
        id="linearGradient4053"
        gradientUnits="userSpaceOnUse"
@@ -140,11 +129,11 @@
     <linearGradient
        id="linearGradient4080-70-3-0">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1"
+         style="stop-color:#ededed;stop-opacity:1"
          offset="0"
          id="stop4082-6-39-41" />
       <stop
-         style="stop-color:#f1f1f1;stop-opacity:1"
+         style="stop-color:#ededed;stop-opacity:1"
          offset="1"
          id="stop4084-4-2-04" />
     </linearGradient>
@@ -160,7 +149,7 @@
        gradientTransform="translate(30,0)" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient4080-70-3"
+       xlink:href="#linearGradient4708"
        id="linearGradient4612"
        gradientUnits="userSpaceOnUse"
        x1="5"
@@ -217,18 +206,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient3845-23">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4080-70-3-2-2"
        id="linearGradient4885"
        gradientUnits="userSpaceOnUse"
@@ -238,16 +215,6 @@
        y2="82.123726" />
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3845-23"
-       id="linearGradient4887"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4080-70-3-2"
        id="linearGradient4889"
        gradientUnits="userSpaceOnUse"
@@ -255,16 +222,6 @@
        y1="109.80856"
        x2="5"
        y2="82.123726" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845"
-       id="linearGradient4891"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath4919">
@@ -313,11 +270,11 @@
        inkscape:collect="always"
        id="linearGradient3845-23-8">
       <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
+         style="stop-color:#7a7a7a;stop-opacity:1"
          offset="0"
          id="stop3847-09-9" />
       <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
+         style="stop-color:#7a7a7a;stop-opacity:1"
          offset="1"
          id="stop3849-655-1" />
     </linearGradient>
@@ -355,28 +312,6 @@
          rx="0"
          ry="0" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-18"
-       id="linearGradient4891-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-18">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-02" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-38" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath4697-3-0">
@@ -390,28 +325,6 @@
          rx="0"
          ry="0" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-9"
-       id="linearGradient4887-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-9">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-5" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-19" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath4697-3-0-8">
@@ -425,28 +338,6 @@
          rx="0"
          ry="0" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-9-3"
-       id="linearGradient4887-4-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-9-3">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-5-5" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-19-9" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath4697-2-4">
@@ -460,28 +351,6 @@
          rx="0"
          ry="0" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-18-7"
-       id="linearGradient4891-6-1"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-18-7">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-02-7" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-38-9" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath4697-3-1-3">
@@ -516,28 +385,6 @@
          offset="1"
          style="stop-color:#d9d9d9;stop-opacity:1" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-8-6"
-       id="linearGradient4887-8-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-8-6">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-9-9" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-1-8" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath4919-9">
@@ -603,28 +450,6 @@
          offset="1"
          id="stop4084-4-2-7-8-6" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-7"
-       id="linearGradient4887-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-7">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-8" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-8" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath4697-7">
@@ -660,28 +485,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3845-00"
-       id="linearGradient4891-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-00">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-099" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4080-70-3-2-2-55"
        id="linearGradient4885-8"
        gradientUnits="userSpaceOnUse"
@@ -702,28 +505,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-0"
-       id="linearGradient4887-7"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-0">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-1" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-9" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient4080-70-3-2-2-55-4"
        id="linearGradient4885-8-1"
        gradientUnits="userSpaceOnUse"
@@ -742,28 +523,6 @@
          offset="1"
          id="stop4084-4-2-7-8-57-8" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-0-8"
-       id="linearGradient4887-7-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-0-8">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-1-6" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-9-4" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5747">
@@ -788,50 +547,6 @@
          y="80"
          transform="scale(-1,1)" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-9-34"
-       id="linearGradient4887-4-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-9-34">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-5-6" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-19-94" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-9-34-1"
-       id="linearGradient4887-4-2-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-9-34-1">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-5-6-3" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-19-94-6" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5899">
@@ -888,28 +603,6 @@
          offset="1"
          id="stop4084-4-2-7-8-57-4" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-0-5"
-       id="linearGradient4887-7-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-0-5">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-1-5" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-9-1" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5751-2">
@@ -942,28 +635,6 @@
          offset="1"
          id="stop4084-4-2-7-8-57-8-0" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-0-8-0"
-       id="linearGradient4887-7-0-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-0-8-0">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-1-6-2" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-9-4-8" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5903-7">
@@ -976,28 +647,6 @@
          y="96"
          transform="scale(-1,1)" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-9-34-1-0"
-       id="linearGradient4887-4-2-6-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-9-34-1-0">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-5-6-3-3" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-19-94-6-2" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5899-0">
@@ -1011,39 +660,17 @@
          transform="scale(-1,1)" />
     </clipPath>
     <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-9-34-3"
-       id="linearGradient4887-4-2-4"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-9-34-3">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-5-6-8" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-19-94-2" />
-    </linearGradient>
-    <linearGradient
        id="linearGradient3919-64">
       <stop
-         style="stop-color:#4795e5;stop-opacity:1"
+         style="stop-color:#729b4b;stop-opacity:1"
          offset="0"
          id="stop3921-45" />
       <stop
          id="stop4701"
          offset="0.25"
-         style="stop-color:#1f7bd9;stop-opacity:1" />
+         style="stop-color:#5e7f3e;stop-opacity:1" />
       <stop
-         style="stop-color:#76b0ec;stop-opacity:1"
+         style="stop-color:#82ae58;stop-opacity:1"
          offset="1"
          id="stop3923-6" />
     </linearGradient>
@@ -1059,28 +686,6 @@
          y="80"
          transform="scale(-1,1)" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-9-34-3-6"
-       id="linearGradient4887-4-2-4-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-9-34-3-6">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-5-6-8-3" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-19-94-2-9" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5751-2-9">
@@ -1113,28 +718,6 @@
          offset="1"
          id="stop4084-4-2-7-8-57-8-0-1" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-0-8-0-3"
-       id="linearGradient4887-7-0-0-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-0-8-0-3">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-1-6-2-6" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-9-4-8-6" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5899-4">
@@ -1147,28 +730,6 @@
          y="80"
          transform="scale(-1,1)" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-9-34-2"
-       id="linearGradient4887-4-2-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-9-34-2">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-5-6-4" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-19-94-62" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5751-3">
@@ -1201,28 +762,6 @@
          offset="1"
          id="stop4084-4-2-7-8-57-8-2" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-0-8-8"
-       id="linearGradient4887-7-0-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-0-8-8">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-1-6-8" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-9-4-4" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5903-7-0">
@@ -1235,28 +774,6 @@
          y="96"
          transform="scale(-1,1)" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-9-34-1-0-9"
-       id="linearGradient4887-4-2-6-3-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-9-34-1-0-9">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-5-6-3-3-4" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-19-94-6-2-2" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5747-3-7">
@@ -1289,28 +806,6 @@
          offset="1"
          id="stop4084-4-2-7-8-57-4-1" />
     </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-0-5-6"
-       id="linearGradient4887-7-8-3"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-0-5-6">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-1-5-9" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-9-1-4" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5903-8">
@@ -1323,28 +818,6 @@
          y="96"
          transform="scale(-1,1)" />
     </clipPath>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-9-34-1-2"
-       id="linearGradient4887-4-2-6-0"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-9-34-1-2">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-5-6-3-9" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-19-94-6-0" />
-    </linearGradient>
     <clipPath
        clipPathUnits="userSpaceOnUse"
        id="clipPath5747-9">
@@ -1379,28 +852,6 @@
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient3845-23-0-6"
-       id="linearGradient4887-7-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.46666667,0,0,2.0714287,1.2666667,80.464286)"
-       x1="8.0000019"
-       y1="1.5371597"
-       x2="8.000001"
-       y2="13.462841" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3845-23-0-6">
-      <stop
-         style="stop-color:#b2b6b2;stop-opacity:1"
-         offset="0"
-         id="stop3847-09-1-1" />
-      <stop
-         style="stop-color:#bdbfbd;stop-opacity:1"
-         offset="1"
-         id="stop3849-655-9-2" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
        xlink:href="#linearGradient3919-64"
        id="linearGradient3896"
        gradientUnits="userSpaceOnUse"
@@ -1522,7 +973,7 @@
            height="29"
            width="7"
            id="rect17861"
-           style="color:#000000;fill:none;stroke:url(#linearGradient4043);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       </g>
     </g>
     <g
@@ -1604,7 +1055,7 @@
            height="29"
            width="7"
            id="rect17861-3-0-6"
-           style="color:#000000;fill:#f4f4f2;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;fill:#c6c6c6;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
         <use
            x="0"
            y="0"
@@ -1765,12 +1216,12 @@
          inkscape:connector-curvature="0"
          id="rect17861-3-2-4-8-5-0"
          d="m 14,81.5 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,24 c 0,1.385 1.115,2.5 2.5,2.5 l 2,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-24 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z m 3,2.5 0,24 c 0,0.554 -0.446,1 -1,1 l -2,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-24 z"
-         style="opacity:0.1;color:#000000;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="opacity:0.1;color:#000000;fill:#5e7f3e;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
          inkscape:connector-curvature="0"
          id="rect17861-3-2-4-8-5"
          d="m 14,81.5 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,24 c 0,1.385 1.115,2.5 2.5,2.5 l 2,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-24 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 l -2,0 z m 0,1.5 2,0 c 0.554,0 1,0.446 1,1 l 0,24 c 0,0.554 -0.446,1 -1,1 l -2,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-24 c 0,-0.554 0.446,-1 1,-1 z"
-         style="opacity:0.1;color:#000000;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="opacity:0.1;color:#000000;fill:#5e7f3e;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <use
          transform="translate(10,80)"
          height="1"
@@ -1780,7 +1231,7 @@
          y="0"
          x="0" />
       <rect
-         style="color:#000000;fill:none;stroke:#4a90d9;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:none;stroke:#5e7f3e;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect17861-0-6"
          width="7"
          height="29"
@@ -1818,7 +1269,7 @@
            id="rect17861-3-2-9"
            inkscape:connector-curvature="0" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 2,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 C 8.5,82.615 7.3850003,81.5 6,81.5 l -2,0 z"
            id="rect17861-3-2-9-9"
            inkscape:connector-curvature="0" />
@@ -1852,7 +1303,7 @@
          height="29"
          width="7"
          id="rect17861-3-2-1-0"
-         style="color:#000000;fill:#f4f4f2;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:#c6c6c6;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <rect
          style="color:#000000;fill:none;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          id="rect3183"
@@ -1893,7 +1344,7 @@
        style="color:#000000;fill:url(#linearGradient4224);fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        inkscape:label="#rect17861-3-2-1-3" />
     <rect
-       style="opacity:1;color:#000000;fill:#f4f4f2;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       style="opacity:1;color:#000000;fill:#c6c6c6;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
        id="Entry_entry-bg-disabled"
        width="4"
        height="24"
@@ -1931,7 +1382,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3"
            inkscape:connector-curvature="0"
@@ -1943,7 +1394,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4891);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7"
            inkscape:connector-curvature="0"
@@ -1979,7 +1430,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9"
            inkscape:connector-curvature="0"
@@ -1991,7 +1442,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2"
            inkscape:connector-curvature="0"
@@ -2032,13 +1483,13 @@
          inkscape:connector-curvature="0"
          id="rect17861-3-2-4-8-5-0-3"
          d="m 114,81.5 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,24 c 0,1.385 1.115,2.5 2.5,2.5 l 12,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-24 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z m 13,2.5 0,24 c 0,0.554 -0.446,1 -1,1 l -12,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-24 z"
-         style="opacity:0.1;color:#000000;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="opacity:0.1;color:#000000;fill:#5e7f3e;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
          sodipodi:nodetypes="ssssssssssssssssss"
          inkscape:connector-curvature="0"
          id="rect17861-3-2-4-8-5-7"
          d="m 114,81.5 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,24 c 0,1.385 1.115,2.5 2.5,2.5 l 12,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-24 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z m 0,1.5 12,0 c 0.554,0 1,0.446 1,1 l 0,24 c 0,0.554 -0.446,1 -1,1 l -12,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-24 c 0,-0.554 0.446,-1 1,-1 z"
-         style="opacity:0.1;color:#000000;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="opacity:0.1;color:#000000;fill:#5e7f3e;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
          sodipodi:nodetypes="cssssc"
          inkscape:connector-curvature="0"
@@ -2050,7 +1501,7 @@
          inkscape:connector-curvature="0"
          id="rect17861-0-6-1"
          d="m 114,81.5 12,0 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -12,0 c -1.385,0 -2.5,-1.115 -2.5,-2.5 l 0,-24 c 0,-1.385 1.115,-2.5 2.5,-2.5 z"
-         style="color:#000000;fill:none;stroke:#4a90d9;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:none;stroke:#5e7f3e;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     </g>
     <g
        id="Entry_combo-entry-button-active"
@@ -2081,7 +1532,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-0"
            inkscape:connector-curvature="0"
@@ -2115,7 +1566,7 @@
        transform="translate(90,0)"
        clip-path="url(#clipPath4697-2)">
       <path
-         style="color:#000000;fill:#f4f4f2;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#c6c6c6;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
          id="rect17861-3-2-1-2-3"
          inkscape:connector-curvature="0"
@@ -2138,7 +1589,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4891-6);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-3"
            inkscape:connector-curvature="0"
@@ -2151,7 +1602,7 @@
        transform="matrix(-1,0,0,1,110,0)"
        clip-path="url(#clipPath4697-3-0)">
       <path
-         style="color:#000000;fill:#f4f4f2;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#c6c6c6;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
          id="rect17861-3-2-1-2-2-6"
          inkscape:connector-curvature="0"
@@ -2174,7 +1625,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-4);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-5"
            inkscape:connector-curvature="0"
@@ -2219,7 +1670,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-4"
            inkscape:connector-curvature="0"
@@ -2231,7 +1682,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-9);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-8"
            inkscape:connector-curvature="0"
@@ -2276,7 +1727,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-4"
            inkscape:connector-curvature="0"
@@ -2288,7 +1739,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4891-3);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-4"
            inkscape:connector-curvature="0"
@@ -2301,7 +1752,7 @@
        transform="translate(90,40)"
        clip-path="url(#clipPath4697-3-0-8)">
       <path
-         style="color:#000000;fill:#f4f4f2;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#c6c6c6;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
          id="rect17861-3-2-1-2-2-6-7"
          inkscape:connector-curvature="0"
@@ -2324,7 +1775,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-4-7);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-5-5"
            inkscape:connector-curvature="0"
@@ -2369,7 +1820,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-0-3"
            inkscape:connector-curvature="0"
@@ -2381,7 +1832,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-8-9);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-9-7"
            inkscape:connector-curvature="0"
@@ -2422,13 +1873,13 @@
          inkscape:connector-curvature="0"
          id="rect17861-3-2-4-8-5-0-3-0"
          d="m 114,81.5 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,24 c 0,1.385 1.115,2.5 2.5,2.5 l 12,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-24 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z m 13,2.5 0,24 c 0,0.554 -0.446,1 -1,1 l -12,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-24 z"
-         style="opacity:0.1;color:#000000;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="opacity:0.1;color:#000000;fill:#5e7f3e;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
          sodipodi:nodetypes="ssssssssssssssssss"
          inkscape:connector-curvature="0"
          id="rect17861-3-2-4-8-5-7-3"
          d="m 114,81.5 c -1.385,0 -2.5,1.115 -2.5,2.5 l 0,24 c 0,1.385 1.115,2.5 2.5,2.5 l 12,0 c 1.385,0 2.5,-1.115 2.5,-2.5 l 0,-24 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z m 0,1.5 12,0 c 0.554,0 1,0.446 1,1 l 0,24 c 0,0.554 -0.446,1 -1,1 l -12,0 c -0.554,0 -1,-0.446 -1,-1 l 0,-24 c 0,-0.554 0.446,-1 1,-1 z"
-         style="opacity:0.1;color:#000000;fill:#4a90d9;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="opacity:0.1;color:#000000;fill:#5e7f3e;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       <path
          sodipodi:nodetypes="cssssc"
          inkscape:connector-curvature="0"
@@ -2440,7 +1891,7 @@
          inkscape:connector-curvature="0"
          id="rect17861-0-6-1-0"
          d="m 114,81.5 12,0 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -12,0 c -1.385,0 -2.5,-1.115 -2.5,-2.5 l 0,-24 c 0,-1.385 1.115,-2.5 2.5,-2.5 z"
-         style="color:#000000;fill:none;stroke:#4a90d9;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+         style="color:#000000;fill:none;stroke:#5e7f3e;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
     </g>
     <g
        id="Entry_combo-entry-border-disabled-rtl"
@@ -2448,7 +1899,7 @@
        transform="matrix(-1,0,0,1,110,40)"
        clip-path="url(#clipPath4697-2-4)">
       <path
-         style="color:#000000;fill:#f4f4f2;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         style="color:#000000;fill:#c6c6c6;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
          d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
          id="rect17861-3-2-1-2-3-0"
          inkscape:connector-curvature="0"
@@ -2471,7 +1922,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4891-6-1);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-3-6"
            inkscape:connector-curvature="0"
@@ -2507,7 +1958,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-7"
            inkscape:connector-curvature="0"
@@ -2519,7 +1970,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-7);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-2"
            inkscape:connector-curvature="0"
@@ -2573,7 +2024,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-4-2-6);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-5-55-7"
            inkscape:connector-curvature="0"
@@ -2627,7 +2078,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-7-3"
            inkscape:connector-curvature="0"
@@ -2639,7 +2090,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-7-8);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-2-1"
            inkscape:connector-curvature="0"
@@ -2693,7 +2144,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-4-2-6-3);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-5-55-7-6"
            inkscape:connector-curvature="0"
@@ -2747,7 +2198,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-7-9"
            inkscape:connector-curvature="0"
@@ -2759,7 +2210,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-7-0);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-2-0"
            inkscape:connector-curvature="0"
@@ -2804,7 +2255,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-4-2);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-5-55"
            inkscape:connector-curvature="0"
@@ -2849,7 +2300,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-7-9-1"
            inkscape:connector-curvature="0"
@@ -2861,7 +2312,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-7-0-0);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-2-0-1"
            inkscape:connector-curvature="0"
@@ -2906,7 +2357,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-4-2-4);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-5-55-0"
            inkscape:connector-curvature="0"
@@ -2995,7 +2446,7 @@
            height="29"
            width="7"
            id="rect17861-8"
-           style="color:#000000;fill:none;stroke:#2a79cb;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+           style="color:#000000;fill:none;stroke:#5e7f3e;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
       </g>
     </g>
     <g
@@ -3040,7 +2491,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-7-9-6"
            inkscape:connector-curvature="0"
@@ -3052,7 +2503,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-7-0-9);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-2-0-4"
            inkscape:connector-curvature="0"
@@ -3097,7 +2548,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-7-2"
            inkscape:connector-curvature="0"
@@ -3109,7 +2560,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-7-2);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-2-7"
            inkscape:connector-curvature="0"
@@ -3163,7 +2614,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-4-2-6-0);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-5-55-7-67"
            inkscape:connector-curvature="0"
@@ -3217,7 +2668,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-7-9-1-9"
            inkscape:connector-curvature="0"
@@ -3229,7 +2680,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-7-0-0-9);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-2-0-1-2"
            inkscape:connector-curvature="0"
@@ -3274,7 +2725,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="ssccssccsss" />
         <path
-           style="opacity:0.1;color:#000000;fill:#2b0000;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="opacity:0.1;color:#000000;fill:#2b2b2b;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="m 4,81.5 c -1.3850003,0 -2.5,1.115 -2.5,2.5 l 0,2 0.5,0 0,-1 c 0,-1.108 0.892,-2 2,-2 l 12,0 c 1.108,0 2,0.892 2,2 l 0,1 0.5,0 0,-2 c 0,-1.385 -1.115,-2.5 -2.5,-2.5 z"
            id="rect17861-3-2-9-9-3-9-7-3-5"
            inkscape:connector-curvature="0"
@@ -3286,7 +2737,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-7-8-3);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-2-1-0"
            inkscape:connector-curvature="0"
@@ -3340,7 +2791,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-4-2-4-2);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-5-55-0-0"
            inkscape:connector-curvature="0"
@@ -3385,7 +2836,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-4-2-6-3-8);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-5-55-7-6-9"
            inkscape:connector-curvature="0"
@@ -3439,7 +2890,7 @@
            inkscape:connector-curvature="0"
            sodipodi:nodetypes="cssssc" />
         <path
-           style="color:#000000;fill:none;stroke:url(#linearGradient4887-4-2-8);stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           style="color:#000000;fill:none;stroke:#7a7a7a;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
            d="M 4.0000005,81.5 16,81.5 c 1.385,0 2.5,1.115 2.5,2.5 l 0,24 c 0,1.385 -1.115,2.5 -2.5,2.5 l -11.9999995,0 C 2.6150002,110.5 1.5,109.385 1.5,108 l 0,-24 c 0,-1.385 1.1150002,-2.5 2.5000005,-2.5 z"
            id="use4309-7-2-5-55-9"
            inkscape:connector-curvature="0"
--- a/gtk-2.0/gtkrc	Sat Apr 09 21:13:42 2016 +0100
+++ b/gtk-2.0/gtkrc	Sat Apr 16 14:51:05 2016 +0100
@@ -1,6 +1,7 @@
 # Bridge | ScionicSpectre
 
-gtk-color-scheme	= "base_color:#FFFFFF\nfg_color:#2E3436\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#4A90D9\nselected_fg_color:#FFFFFF\ntext_color:#313739\nbg_color:#EDEDED\ninsensitive_bg_color:#F4F4F2\ntooltip_bg_color:#343434"
+gtk-color-scheme	= "base_color:#F0F0F0\nfg_color:#363636\ntooltip_fg_color:#FFFFFF\nselected_bg_color:#5E7F3E\nselected_fg_color:#FFFFFF\ntext_color:#242424\nbg_color:#C6C6C6\ninsensitive_bg_color:#c6c6c6\ntooltip_bg_color:#080808"
+gtk-color-scheme	= "bg_dark_color:#3D3D3D\nfg_dark_color:#cbcdcc\ntext_dark_color:#dcddde"
 
 gtk-auto-mnemonics              = 1
 gtk-primary-button-warps-slider = 1
@@ -675,8 +676,12 @@
 
 style "menubar"
 {
-	bg[PRELIGHT]	= "#FFF"
-	fg[SELECTED]	= @text_color
+	fg[NORMAL]          = @fg_dark_color
+	fg[PRELIGHT]        = @selected_fg_color
+	fg[ACTIVE]          = @selected_fg_color
+	fg[SELECTED]        = @selected_fg_color
+
+	bg[NORMAL]          = @bg_dark_color
 
 	xthickness	= 0
 	ythickness	= 0
@@ -702,10 +707,11 @@
 	ythickness	= 0
 
 	GtkMenuItem::arrow-scaling	= 0.4
+	fg[PRELIGHT]        = @selected_fg_color
+	fg[ACTIVE]          = @selected_fg_color
+	fg[SELECTED]        = @selected_fg_color
 
-	bg[NORMAL]	= shade (1.08, @bg_color)
-        bg[INSENSITIVE] = @base_color
-        bg[PRELIGHT]    = @base_color
+	bg[NORMAL]			= @bg_dark_color
 
 	engine "pixmap"	# For menus that use horizontal lines rather than gtkseparator
 	{
@@ -741,6 +747,7 @@
         # See https://bugs.freedesktop.org/show_bug.cgi?id=38038
         bg[SELECTED]    = @selected_fg_color
 
+	fg[NORMAL]	= @fg_dark_color
 	bg[PRELIGHT]	= @selected_bg_color
 	fg[PRELIGHT]	= @selected_fg_color
 	text[PRELIGHT]	= @selected_fg_color
@@ -1034,7 +1041,7 @@
 		detail			= "entry"
                 state                   = NORMAL
 		shadow			= IN
-		file			= "Entry/entry-border-bg.png"
+		file			= "Entry/entry-border.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1044,7 +1051,7 @@
 		detail			= "entry"
                 state                   = INSENSITIVE
 		shadow			= IN
-		file			= "Entry/entry-border-disabled-bg.png"
+		file			= "Entry/entry-border-disabled.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1053,7 +1060,7 @@
 		function		= SHADOW
 		detail			= "entry"
                 state                   = ACTIVE
-		file			= "Entry/entry-border-active-bg.png"
+		file			= "Entry/entry-border-active.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1094,7 +1101,7 @@
 		detail			= "entry"
                 state                   = NORMAL
 		shadow			= IN
-		file			= "Entry/notebook-entry-border-bg.png"
+		file			= "Entry/notebook-entry-border.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1104,7 +1111,7 @@
 		detail			= "entry"
                 state                   = INSENSITIVE
 		shadow			= IN
-		file			= "Entry/notebook-entry-border-disabled-bg.png"
+		file			= "Entry/notebook-entry-border-disabled.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1113,7 +1120,7 @@
 		function		= SHADOW
 		detail			= "entry"
 	        state                   = ACTIVE
-		file			= "Entry/notebook-entry-border-active-bg.png"
+		file			= "Entry/notebook-entry-border-active.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
 	}
@@ -1157,7 +1164,7 @@
 		detail			= "entry"
                 state                   = NORMAL
 		shadow			= IN
-		file			= "Entry/combo-entry-border-bg.png"
+		file			= "Entry/combo-entry-border.png"
 		border			= { 4, 4, 4, 4 }
 		stretch			= TRUE
                 direction               = LTR
@@ -1168,7 +1175,7 @@
 		detail			= "entry"
                 state                   = INSENSITIVE
 		shadow			= IN
-		file			= "Entry/combo-entry-border-disabled-bg.png"
+		file			= "Entry/combo-entry-border-disabled.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = LTR
@@ -1178,7 +1185,7 @@
 		function		= SHADOW
 		detail			= "entry"
                 state                   = ACTIVE
-		file			= "Entry/combo-entry-border-active-bg.png"
+		file			= "Entry/combo-entry-border-active.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = LTR
@@ -1191,7 +1198,7 @@
 		detail			= "entry"
                 state                   = NORMAL
 		shadow			= IN
-		file			= "Entry/combo-entry-border-rtl-bg.png"
+		file			= "Entry/combo-entry-border-rtl.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = RTL
@@ -1202,7 +1209,7 @@
 		detail			= "entry"
                 state                   = INSENSITIVE
 		shadow			= IN
-		file			= "Entry/combo-entry-border-disabled-rtl-bg.png"
+		file			= "Entry/combo-entry-border-disabled-rtl.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = RTL
@@ -1212,7 +1219,7 @@
 		function		= SHADOW
 		detail			= "entry"
                 state                   = ACTIVE
-		file			= "Entry/combo-entry-border-active-rtl-bg.png"
+		file			= "Entry/combo-entry-border-active-rtl.png"
 		border			= { 4, 4, 5, 4 }
 		stretch			= TRUE
                 direction               = RTL
@@ -1740,6 +1747,7 @@
 
 style "notebook"
 {
+  bg[NORMAL] = @bg_color
 
   xthickness	= 5
   ythickness	= 2
@@ -2273,20 +2281,20 @@
 # Chromium
 style "chrome-gtk-frame"
 {
-	ChromeGtkFrame::frame-color = @bg_color
-	ChromeGtkFrame::inactive-frame-color = @bg_color
+	ChromeGtkFrame::frame-color = @bg_dark_color
+	ChromeGtkFrame::inactive-frame-color = @bg_dark_color
 
 	ChromeGtkFrame::frame-gradient-size = 16
-	ChromeGtkFrame::frame-gradient-color = shade(1.07, @bg_color)
+	ChromeGtkFrame::frame-gradient-color = shade(1.07, @bg_dark_color)
 
-	ChromeGtkFrame::incognito-frame-color = shade(0.85, @bg_color)
-	ChromeGtkFrame::incognito-inactive-frame-color = @bg_color
+	ChromeGtkFrame::incognito-frame-color = shade(0.85, @bg_dark_color)
+	ChromeGtkFrame::incognito-inactive-frame-color = @bg_dark_color
 
-	ChromeGtkFrame::incognito-frame-gradient-color = @bg_color
+	ChromeGtkFrame::incognito-frame-gradient-color = @bg_dark_color
 
-	ChromeGtkFrame::scrollbar-trough-color = shade(0.912, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-prelight-color = shade(1.04, @bg_color)
-	ChromeGtkFrame::scrollbar-slider-normal-color = @bg_color
+	ChromeGtkFrame::scrollbar-trough-color = shade(0.912, @bg_dark_color)
+	ChromeGtkFrame::scrollbar-slider-prelight-color = shade(1.04, @bg_dark_color)
+	ChromeGtkFrame::scrollbar-slider-normal-color = @bg_dark_color
 }
 
 style "chrome_menu_item"