Gtk-4: Fix color styling issues

Changing thumbnail for metacity theme (mars)

.gitignore

@@ -10,5 +10,6 @@ gnome-shell/dark-and-white/
 gnome-shell/dark/
 gnome-shell/light/
 
-
 install.sh
+
+*.tar

Gulpfile.js

@@ -11,7 +11,7 @@ gulp.task('styles', function(done) {
 });
 
 gulp.task('shell-style', function(done) {
-    gulp.src('gnome-shell/*.scss')
+    gulp.src('gnome-shell/**/*.scss')
         .pipe(sass().on('error', sass.logError))
         .pipe(gulp.dest('./gnome-shell/'))
         .pipe(exec('gsettings set org.gnome.shell.extensions.user-theme name "Sweet"'))

assets/close.svg

@@ -16,32 +16,41 @@
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="close.svg"
-   inkscape:export-filename="/home/lara/github/Blitz/assets/close.png"
-   inkscape:export-xdpi="92.606628"
-   inkscape:export-ydpi="92.606628">
+   inkscape:export-filename="/home/lara/github/shell/assets/close.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <defs
      id="defs4">
     <linearGradient
        inkscape:collect="always"
-       id="linearGradient847">
+       xlink:href="#linearGradient822"
+       id="linearGradient824"
+       x1="41.921902"
+       y1="521.56696"
+       x2="1003.6516"
+       y2="521.56696"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient822">
       <stop
-         style="stop-color:#ff416c;stop-opacity:1"
+         style="stop-color:#f67e7d;stop-opacity:1"
          offset="0"
-         id="stop843" />
+         id="stop818" />
       <stop
-         style="stop-color:#ff4b2b;stop-opacity:1"
+         style="stop-color:#f79f79;stop-opacity:1"
          offset="1"
-         id="stop845" />
+         id="stop820" />
     </linearGradient>
     <linearGradient
        inkscape:collect="always"
-       xlink:href="#linearGradient847"
-       id="linearGradient849"
-       x1="5.6857156"
-       y1="515.15102"
-       x2="865.45459"
-       y2="540.10333"
-       gradientUnits="userSpaceOnUse" />
+       xlink:href="#linearGradient822"
+       id="linearGradient847"
+       gradientUnits="userSpaceOnUse"
+       x1="41.921902"
+       y1="521.56696"
+       x2="1003.6516"
+       y2="521.56696" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -50,9 +59,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="18.89222"
-     inkscape:cx="1.3802801"
-     inkscape:cy="10.842274"
+     inkscape:zoom="17.53045"
+     inkscape:cx="9.0248035"
+     inkscape:cy="6.2588182"
      inkscape:document-units="px"
      inkscape:current-layer="g4092"
      showgrid="true"
@@ -61,7 +70,7 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-height="712"
      inkscape:window-x="0"
      inkscape:window-y="25"
      inkscape:window-maximized="1" />
@@ -91,11 +100,24 @@
          id="g4092">
         <path
            id="path4094"
-           style="fill:url(#linearGradient849);fill-opacity:1;fill-rule:evenodd;stroke:#e70340;stroke-opacity:1;stroke-width:40.53333333;stroke-miterlimit:4;stroke-dasharray:none"
-           d="m 558.77702,-37.935253 c 305.45606,0 553.08158,247.625863 553.08158,553.085803 0,305.46124 -247.62552,553.08675 -553.08158,553.08675 -305.46512,0 -553.0913044,-247.62551 -553.0913044,-553.08675 0,-305.45994 247.6261844,-553.085803 553.0913044,-553.085803"
+           style="fill:#d52735;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1"
+           d="m 566.69348,-34.526078 c 305.45603,0 553.08142,247.625868 553.08142,553.085848 0,305.46126 -247.62539,553.08673 -553.08142,553.08673 -305.46513,0 -553.091323,-247.62547 -553.091323,-553.08673 0,-305.45998 247.626193,-553.085848 553.091323,-553.085848"
+           inkscape:connector-curvature="0" />
+        <g
+           id="g4144"
+           transform="matrix(1.0680344,0,0,1.0680344,8.3342675,-38.491238)"
+           style="fill:url(#linearGradient824);fill-opacity:1">
+          <path
              inkscape:connector-curvature="0"
-           inkscape:export-xdpi="96"
-           inkscape:export-ydpi="96" />
+             d="m 522.79173,40.6992 c 265.56911,0 480.85987,215.29542 480.85987,480.86946 0,265.57526 -215.29076,480.86604 -480.85987,480.86604 -265.57896,0 -480.86983,-215.29078 -480.86983,-480.86604 0,-265.57404 215.29087,-480.86946 480.86983,-480.86946"
+             style="fill:url(#linearGradient847);fill-opacity:1;fill-rule:evenodd;stroke:none"
+             id="path4096" />
+          <path
+             inkscape:connector-curvature="0"
+             id="path4098"
+             d="m 306.28404,782.14979 c -11.06764,0 -22.15209,-4.31529 -30.55026,-12.71345 l -0.75901,-0.75902 c -16.79758,-16.79634 -16.79758,-44.30417 0,-61.10052 L 460.93287,521.6187 274.97477,335.47086 c -16.79266,-16.79145 -16.79266,-44.11445 0,-60.91075 l 0.75901,-0.94881 c 16.79142,-16.7963 44.30418,-16.7963 61.10051,0 L 522.7924,459.56941 708.7505,273.6113 c 16.79265,-16.7963 44.30417,-16.7963 61.10052,0 l 0.75901,0.94881 c 16.79142,16.79144 16.79142,44.1193 0,60.91075 l -185.9581,186.14784 185.9581,185.9581 c 16.79142,16.79635 16.79635,44.3091 0,61.10052 l -0.75901,0.75902 c -16.80126,16.79142 -44.30787,16.79142 -61.10052,0 L 522.7924,583.47823 336.83429,769.43634 c -8.39817,8.39816 -19.48262,12.71345 -30.55025,12.71345 z"
+             style="fill:#d52735;fill-opacity:0.0106383;fill-rule:evenodd;stroke:none" />
+        </g>
       </g>
     </g>
   </g>

assets/close_prelight.svg

@@ -7,16 +7,42 @@
    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"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="close_prelight.svg">
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="close_prelight.svg"
+   inkscape:export-filename="/home/lara/github/shell/assets/close_prelight.png"
+   inkscape:export-xdpi="96.000008"
+   inkscape:export-ydpi="96.000008">
   <defs
-     id="defs4" />
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient822">
+      <stop
+         style="stop-color:#f67e7d;stop-opacity:1"
+         offset="0"
+         id="stop818" />
+      <stop
+         style="stop-color:#f79f79;stop-opacity:1"
+         offset="1"
+         id="stop820" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient822"
+       id="linearGradient824"
+       x1="41.9219"
+       y1="521.56695"
+       x2="1003.6516"
+       y2="521.56695"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,9 +50,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="7.919596"
-     inkscape:cx="-22.186226"
-     inkscape:cy="7.0490381"
+     inkscape:zoom="24.962964"
+     inkscape:cx="-5.7901035"
+     inkscape:cy="5.7895101"
      inkscape:document-units="px"
      inkscape:current-layer="g4092"
      showgrid="true"
@@ -34,10 +60,10 @@
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1360"
-     inkscape:window-height="714"
+     inkscape:window-width="1366"
+     inkscape:window-height="712"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="25"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
@@ -47,7 +73,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>
@@ -70,17 +96,18 @@
            inkscape:connector-curvature="0" />
         <g
            id="g4144"
-           transform="matrix(1.0680345,0,0,1.0680345,0.41786301,-41.900484)">
+           transform="matrix(1.0680345,0,0,1.0680345,0.41786301,-41.900484)"
+           style="fill-opacity:1;fill:url(#linearGradient824)">
           <path
              inkscape:connector-curvature="0"
              d="m 522.79173,40.6992 c 265.56911,0 480.85987,215.29542 480.85987,480.86946 0,265.57526 -215.29076,480.86604 -480.85987,480.86604 -265.57896,0 -480.86983,-215.29078 -480.86983,-480.86604 0,-265.57404 215.29087,-480.86946 480.86983,-480.86946"
-             style="fill:#f25056;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             style="fill:url(#linearGradient824);fill-opacity:1;fill-rule:evenodd;stroke:none"
              id="path4096" />
           <path
              inkscape:connector-curvature="0"
              id="path4098"
              d="m 306.28404,782.14979 c -11.06764,0 -22.15209,-4.31529 -30.55026,-12.71345 l -0.75901,-0.75902 c -16.79758,-16.79634 -16.79758,-44.30417 0,-61.10052 L 460.93287,521.6187 274.97477,335.47086 c -16.79266,-16.79145 -16.79266,-44.11445 0,-60.91075 l 0.75901,-0.94881 c 16.79142,-16.7963 44.30418,-16.7963 61.10051,0 L 522.7924,459.56941 708.7505,273.6113 c 16.79265,-16.7963 44.30417,-16.7963 61.10052,0 l 0.75901,0.94881 c 16.79142,16.79144 16.79142,44.1193 0,60.91075 l -185.9581,186.14784 185.9581,185.9581 c 16.79142,16.79635 16.79635,44.3091 0,61.10052 l -0.75901,0.75902 c -16.80126,16.79142 -44.30787,16.79142 -61.10052,0 L 522.7924,583.47823 336.83429,769.43634 c -8.39817,8.39816 -19.48262,12.71345 -30.55025,12.71345 z"
-             style="fill:#9f1d2b;fill-opacity:1;fill-rule:evenodd;stroke:none" />
+             style="fill:#d52735;fill-opacity:1;fill-rule:evenodd;stroke:none" />
         </g>
       </g>
     </g>

assets/close_unfocused.svg

@@ -13,11 +13,8 @@
    height="13"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92+devel unknown"
-   sodipodi:docname="close_unfocused.svg"
-   inkscape:export-filename="/home/lara/.themes/Ant/assets/close_unfocused.png"
-   inkscape:export-xdpi="112"
-   inkscape:export-ydpi="112">
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="close_unfocused.svg">
   <defs
      id="defs4" />
   <sodipodi:namedview
@@ -27,9 +24,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="19.317893"
-     inkscape:cx="3.9939335"
-     inkscape:cy="8.8454396"
+     inkscape:zoom="24.366357"
+     inkscape:cx="3.4792551"
+     inkscape:cy="7.2127605"
      inkscape:document-units="px"
      inkscape:current-layer="g4197"
      showgrid="true"
@@ -38,11 +35,10 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:window-width="1366"
-     inkscape:window-height="705"
+     inkscape:window-height="707"
      inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:document-rotation="0" />
+     inkscape:window-y="25"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -76,18 +72,14 @@
              id="g4197">
             <path
                id="path4199"
-               style="fill:#b4b4b4;fill-opacity:1;fill-rule:evenodd;stroke:none"
-               d="m 399.0119,-25.290703 c 236.063,0 427.43,191.363693 427.43,427.429693 0,236.059 -191.367,427.426 -427.43,427.426 -236.062,0 -427.429474,-191.367 -427.429474,-427.426 0,-236.066 191.367474,-427.429693 427.429474,-427.429693"
-               inkscape:connector-curvature="0"
-               inkscape:export-xdpi="124.22228"
-               inkscape:export-ydpi="124.22228" />
+               style="fill:#5b5c63;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               d="m 401.01486,-37.584555 c 236.063,0 427.43,191.363695 427.43,427.429695 0,236.059 -191.367,427.426 -427.43,427.426 -236.062,0 -427.429467,-191.367 -427.429467,-427.426 0,-236.066 191.367467,-427.429695 427.429467,-427.429695"
+               inkscape:connector-curvature="0" />
             <path
                id="path4201"
-               style="fill:#d4d4d4;fill-opacity:1;fill-rule:evenodd;stroke:none"
-               d="m 399.0119,11.060887 c 215.985,0 391.078,175.090103 391.078,391.078103 0,215.98 -175.093,391.074 -391.078,391.074 -215.984,0 -391.0779043,-175.094 -391.0779043,-391.074 0,-215.988 175.0939043,-391.078103 391.0779043,-391.078103"
-               inkscape:connector-curvature="0"
-               inkscape:export-xdpi="124.22228"
-               inkscape:export-ydpi="124.22228" />
+               style="fill:#5b5c63;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               d="m 401.01486,-1.2329648 c 215.985,0 391.078,175.0901048 391.078,391.0781048 0,215.98 -175.093,391.074 -391.078,391.074 -215.984,0 -391.0778972,-175.094 -391.0778972,-391.074 0,-215.988 175.0938972,-391.0781048 391.0778972,-391.0781048"
+               inkscape:connector-curvature="0" />
           </g>
         </g>
       </g>

assets/maximize.svg

@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="maximize.svg"
-   inkscape:export-filename="/home/lara/github/Blitz/assets/maximize.png"
+   inkscape:export-filename="/home/lara/github/shell/assets/maximize.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96">
   <defs
@@ -25,11 +25,11 @@
        inkscape:collect="always"
        id="linearGradient822">
       <stop
-         style="stop-color:#d300dc;stop-opacity:1"
+         style="stop-color:#a0c1b9;stop-opacity:1"
          offset="0"
          id="stop818" />
       <stop
-         style="stop-color:#8700ff;stop-opacity:1"
+         style="stop-color:#98b7af;stop-opacity:1"
          offset="1"
          id="stop820" />
     </linearGradient>
@@ -50,9 +50,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="19.261384"
-     inkscape:cx="4.6054322"
-     inkscape:cy="8.0100111"
+     inkscape:zoom="22.552836"
+     inkscape:cx="-0.53336225"
+     inkscape:cy="7.9420502"
      inkscape:document-units="px"
      inkscape:current-layer="g4287"
      showgrid="true"
@@ -61,7 +61,7 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-height="712"
      inkscape:window-x="0"
      inkscape:window-y="25"
      inkscape:window-maximized="1" />
@@ -98,7 +98,7 @@
              id="g4287">
             <path
                id="path4289"
-               style="fill:#b800d2;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               style="fill:#8fd1bf;fill-opacity:1;fill-rule:evenodd;stroke:none"
                d="m 562.7806,-38.053372 c 305.45604,0 553.0815,247.625852 553.0815,553.085772 0,305.46122 -247.62546,553.0867 -553.0815,553.0867 -305.4651,0 -553.0913989,-247.62548 -553.0913989,-553.0867 0,-305.45992 247.6262989,-553.085772 553.0913989,-553.085772"
                inkscape:connector-curvature="0" />
             <path

assets/maximize_prelight.svg

@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="maximize_prelight.svg"
-   inkscape:export-filename="/home/lara/github/Blitz/assets/maximize_prelight.png"
+   inkscape:export-filename="/home/lara/github/shell/assets/maximize_prelight.png"
    inkscape:export-xdpi="96"
    inkscape:export-ydpi="96">
   <defs
@@ -35,11 +35,11 @@
        inkscape:collect="always"
        id="linearGradient822">
       <stop
-         style="stop-color:#d300dc;stop-opacity:1"
+         style="stop-color:#a0c1b9;stop-opacity:1"
          offset="0"
          id="stop818" />
       <stop
-         style="stop-color:#8700ff;stop-opacity:1"
+         style="stop-color:#98b7af;stop-opacity:1"
          offset="1"
          id="stop820" />
     </linearGradient>
@@ -51,9 +51,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16.875"
-     inkscape:cx="5.3647948"
-     inkscape:cy="3.2140049"
+     inkscape:zoom="26.595424"
+     inkscape:cx="9.026514"
+     inkscape:cy="9.9563917"
      inkscape:document-units="px"
      inkscape:current-layer="g4092"
      showgrid="true"
@@ -62,7 +62,7 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-height="712"
      inkscape:window-x="0"
      inkscape:window-y="25"
      inkscape:window-maximized="1" />
@@ -92,7 +92,7 @@
          id="g4092">
         <path
            id="path4289"
-           style="fill:#b800d2;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1"
+           style="fill:#536460;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1"
            d="m 565.94519,-50.875303 c 305.456,0 553.08141,247.625793 553.08141,553.085743 0,305.46122 -247.62541,553.08676 -553.08141,553.08676 -305.4651,0 -553.091405,-247.62554 -553.091405,-553.08676 0,-305.45995 247.626305,-553.085743 553.091405,-553.085743"
            inkscape:connector-curvature="0" />
         <path
@@ -107,7 +107,7 @@
           <path
              inkscape:connector-curvature="0"
              d="m 317.36351,650.00117 267.199,0 c 35.579,0 64.692,-29.113 64.692,-64.695 l 0,-267.196 -331.891,331.891 z m 232.324,-436.211 -268.253,0 c -35.583,0 -64.692,29.109 -64.692,64.691 l 0,268.254 332.945,-332.945"
-             style="fill:#432f52;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             style="fill:#536460;fill-opacity:1;fill-rule:evenodd;stroke:none"
              id="path4293" />
         </g>
       </g>

assets/min.svg

@@ -16,7 +16,7 @@
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="min.svg"
-   inkscape:export-filename="/home/lara/github/Blitz/assets/min.png"
+   inkscape:export-filename="/home/lara/github/shell/assets/min.png"
    inkscape:export-xdpi="95.99958"
    inkscape:export-ydpi="95.99958">
   <defs
@@ -25,11 +25,11 @@
        inkscape:collect="always"
        id="linearGradient824">
       <stop
-         style="stop-color:#f7f206;stop-opacity:1"
+         style="stop-color:#e1dd8f;stop-opacity:1"
          offset="0"
          id="stop820" />
       <stop
-         style="stop-color:#ffbb24;stop-opacity:1"
+         style="stop-color:#d6d289;stop-opacity:1"
          offset="1"
          id="stop822" />
     </linearGradient>
@@ -50,9 +50,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="19.261386"
-     inkscape:cx="0.25030614"
-     inkscape:cy="4.6721753"
+     inkscape:zoom="22.555576"
+     inkscape:cx="2.4840015"
+     inkscape:cy="9.5282062"
      inkscape:document-units="px"
      inkscape:current-layer="g4415"
      showgrid="true"
@@ -61,7 +61,7 @@
      fit-margin-right="0"
      fit-margin-bottom="0"
      inkscape:window-width="1366"
-     inkscape:window-height="713"
+     inkscape:window-height="712"
      inkscape:window-x="0"
      inkscape:window-y="25"
      inkscape:window-maximized="1" />
@@ -73,7 +73,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>

assets/min_prelight.svg

@@ -7,16 +7,42 @@
    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"
    height="16"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="min_prelight.svg">
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   sodipodi:docname="min_prelight.svg"
+   inkscape:export-filename="/home/lara/github/shell/assets/min_prelight.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
   <defs
-     id="defs4" />
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient826">
+      <stop
+         style="stop-color:#e1dd8f;stop-opacity:1"
+         offset="0"
+         id="stop822" />
+      <stop
+         style="stop-color:#d6d289;stop-opacity:1"
+         offset="1"
+         id="stop824" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient826"
+       id="linearGradient828"
+       x1="5.6782586"
+       y1="55.705048"
+       x2="106.88732"
+       y2="55.705048"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
   <sodipodi:namedview
      id="base"
      pagecolor="#ffffff"
@@ -24,20 +50,20 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="6.331506"
-     inkscape:cy="4.6169098"
+     inkscape:zoom="33.875"
+     inkscape:cx="7.947838"
+     inkscape:cy="6.9785334"
      inkscape:document-units="px"
-     inkscape:current-layer="g4092"
+     inkscape:current-layer="g4285"
      showgrid="true"
      fit-margin-top="0"
      fit-margin-left="0"
      fit-margin-right="0"
      fit-margin-bottom="0"
-     inkscape:window-width="1360"
-     inkscape:window-height="714"
+     inkscape:window-width="1366"
+     inkscape:window-height="712"
      inkscape:window-x="0"
-     inkscape:window-y="28"
+     inkscape:window-y="25"
      inkscape:window-maximized="1" />
   <metadata
      id="metadata7">
@@ -47,7 +73,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>
@@ -70,19 +96,20 @@
           <path
              inkscape:connector-curvature="0"
              d="m 56.277533,-3.8051186 c 30.546127,0 55.308677,24.7625166 55.308677,55.3086436 0,30.54561 -24.76255,55.308165 -55.308677,55.308165 -30.545998,0 -55.30861206,-24.762555 -55.30861206,-55.308165 0,-30.546127 24.76261406,-55.3086436 55.30861206,-55.3086436"
-             style="fill:#da9e10;fill-opacity:1;fill-rule:evenodd;stroke:none"
+             style="fill:#62603f;fill-opacity:1;fill-rule:evenodd;stroke:none"
              id="path4417" />
           <g
              id="g4152"
-             transform="matrix(1.0148899,0,0,1.0148899,-0.8432698,-5.0312058)">
+             transform="matrix(1.0148899,0,0,1.0148899,-0.8432698,-5.0312058)"
+             style="fill-opacity:1;fill:url(#linearGradient828)">
             <path
                id="path4419"
-               style="fill:#fac536;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               style="fill:url(#linearGradient828);fill-opacity:1;fill-rule:evenodd;stroke:none"
                d="m 56.283048,5.1005059 c 27.94807,0 50.604272,22.6563571 50.604272,50.6048151 0,27.947941 -22.656202,50.604269 -50.604272,50.604269 -27.947941,0 -50.6047894,-22.656328 -50.6047894,-50.604269 0,-27.948458 22.6568484,-50.6048151 50.6047894,-50.6048151"
                inkscape:connector-curvature="0" />
             <path
                id="path4421"
-               style="fill:#975914;fill-opacity:1;fill-rule:evenodd;stroke:none"
+               style="fill:#62603f;fill-opacity:1;fill-rule:evenodd;stroke:none"
                d="m 23.994703,60.30905 64.576819,0 c 2.499455,0 4.544076,-2.044103 4.544076,-4.544076 l 0,-0.119823 c 0,-2.499973 -2.044621,-4.544077 -4.544076,-4.544077 l -64.576819,0 c -2.499585,0 -4.544076,2.044104 -4.544076,4.544077 l 0,0.119823 c 0,2.499973 2.044491,4.544076 4.544076,4.544076"
                inkscape:connector-curvature="0" />
           </g>