add missing meson file (issue #16 )

update README
update screenshot
2017-06-26 23:07:10 +02:00 · 2017-06-26 22:59:13 +02:00 · 2017-06-26 22:52:15 +02:00 · 2017-06-26 22:35:05 +02:00 · 2017-06-26 22:18:58 +02:00 · 2017-06-25 20:15:03 +02:00
27 changed files with 1335 additions and 664 deletions
@@ -1,8 +1,37 @@
-# ColorPicker
+# Color Picker

-One Color Picker to rule them all! No overhelming menus and settings. Just a dialog with all the features you'll need:
+One Color Picker to rule them all! No overhelming menus or settings. An easy tool with the features you need.
+
+Features:
 * Pick a color
 * Choose between multiple Color Formats
 * Let the Color History remember your last colors

 ![ColorPicker Screenshot](https://raw.github.com/ronnydo/colorpicker/master/data/screenshot.png)
+
+## Installation
+On elementaryOS? Simply install Color Picker from AppCenter:
+<p align="center">
+  <a href="https://appcenter.elementary.io/com.github.ronnydo.colorpicker">
+    <img src="https://appcenter.elementary.io/badge.svg" alt="Get it on AppCenter">
+  </a>
+</p>
+
+Otherwise you can download and install the [latest .deb file](https://github.com/ronnydo/colorpicker/releases/latest).
+
+## Dependencies
+You'll need the following dependencies to build:
+* granite
+* libgtk-3-dev
+* meson
+* valac
+
+## Build, Install and Run
+Call in the project's root folder:
+
+    meson build && cd build
+    mesonconf -Dprefix=/usr
+    ninja
+    sudo ninja install
+    com.github.ronnydo.colorpicker
+
@@ -7,11 +7,12 @@
  <name>Color Picker</name>
  <summary>The most intuitive Color Picker to speed up your workflow.</summary>
  <description>
-    <p>One Color Picker to rule them all! No overhelming menus and settings. Just a dialog with all the features you'll need:</p>
+    <p>One Color Picker to rule them all! No overhelming menus or settings. An easy tool with the features you need.</p>
+    <p>Features:</p>
     <ul>
       <li>Pick a color</li>
-       <li>Choose between multiple <b>Color Formats</b></li>
-       <li>Let the <b>Color History</b> remember your last colors</li>
+       <li>Choose between multiple Color Formats</li>
+       <li>Let the Color History remember your last colors</li>
    </ul>
  </description>
  <provides>
@@ -26,7 +27,7 @@
  <url type="homepage">https://github.com/RonnyDo/ColorPicker</url>
  <url type="bugtracker">https://github.com/RonnyDo/ColorPicker/issues</url>
  <custom>
-     <value key="x-appcenter-color-primary">#91D5FF</value>
+     <value key="x-appcenter-color-primary">#A3FF91</value>
     <value key="x-appcenter-color-primary-text">#333333</value>
  </custom>
 </component>
@@ -1,10 +1,9 @@
 [Desktop Entry]
 Name=Color Picker
-Comment=The one and only Color Picker to speed up professionals workflow.
-Categories=Utility;
+Comment=An intuitive Color Picker
 Exec=com.github.ronnydo.colorpicker
-Icon=application-default-icon
+Icon=com.github.ronnydo.colorpicker
+Keywords=color;picker;selector;pipette;
 Terminal=false
 Type=Application
-
-Keywords=Color;Picker;
+Categories=GTK;Utility;Graphics;Development;
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+    <schema path="/com/github/ronnydo/colorpicker/"
+    id="com.github.ronnydo.colorpicker"
+    gettext-domain="com.github.ronnydo.colorpicker">
+        <key name="window-x" type="i">
+            <default>-1</default>
+            <summary>Most recent x position of app window</summary>
+            <description>Most recent x position of app window</description>
+        </key>
+        <key name="window-y" type="i">
+            <default>-1</default>
+            <summary>Most recent y position of app window</summary>
+            <description>Most recent y position of app window</description>
+        </key>
+        <key name="color-format-index" type="i">
+	        <default>2</default>
+	        <summary>Most recent index of selected color format</summary>
+	        <description>Most recent index of selected color format</description>
+        </key>
+        <key name="color-history" type="as">
+	        <default>[]</default>
+	        <summary>Color History</summary>
+	        <description>Color History</description>
+        </key>
+    </schema>
+</schemalist>
@@ -6,13 +6,50 @@
   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"
   version="1.1"
   id="svg5644"
   viewBox="0 0 128 128"
   height="128"
-   width="128">
+   width="128"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="com.github.ronnydo.colorpicker.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1631"
+     inkscape:window-height="961"
+     id="namedview52"
+     showgrid="false"
+     showguides="false"
+     inkscape:zoom="2.8284271"
+     inkscape:cx="56.890517"
+     inkscape:cy="94.44466"
+     inkscape:window-x="1665"
+     inkscape:window-y="30"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg5644" />
  <defs
     id="defs5646">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4189">
+      <stop
+         style="stop-color:#f7f7f7;stop-opacity:1"
+         offset="0"
+         id="stop4191" />
+      <stop
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="1"
+         id="stop4193" />
+    </linearGradient>
    <radialGradient
       r="62.769119"
       fy="193.04066"
@@ -40,11 +77,11 @@
    </linearGradient>
    <radialGradient
       r="62.769119"
-       fy="-500.58121"
-       fx="-150.24731"
-       cy="-500.58121"
-       cx="-150.24731"
-       gradientTransform="matrix(0.78392881,0,0,0.24299389,181.87534,1157.9921)"
+       fy="-516.01373"
+       fx="-151.86722"
+       cy="-516.01373"
+       cx="-151.86722"
+       gradientTransform="matrix(0.6963061,-8.8819362e-8,2.5407298e-8,0.19918243,169.58823,211.02257)"
       gradientUnits="userSpaceOnUse"
       id="radialGradient3163-0-2"
       xlink:href="#linearGradient3820-7-2-8-6" />
@@ -115,6 +152,54 @@
       gradientUnits="userSpaceOnUse"
       id="radialGradient3163"
       xlink:href="#linearGradient3820-7-2-8-6" />
+    <linearGradient
+       y2="40.495617"
+       x2="71.204407"
+       y1="15.369057"
+       x1="71.204407"
+       gradientTransform="matrix(4.16388,0,0,4.16388,-236.03265,-50.036246)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3118-2"
+       xlink:href="#linearGradient4806" />
+    <radialGradient
+       r="62.769119"
+       fy="186.17059"
+       fx="99.157013"
+       cy="186.17059"
+       cx="99.157013"
+       gradientTransform="matrix(0.6869404,0,0,0.21461693,-4.02174,68.573331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3163-9"
+       xlink:href="#linearGradient3820-7-2-8-6" />
+    <radialGradient
+       gradientTransform="matrix(0,46.861858,-92.320077,0,985.84907,-380.50601)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-8-9"
+       id="radialGradient5521-1-1"
+       fy="9.9571075"
+       fx="6.9303164"
+       r="12.671875"
+       cy="9.9571075"
+       cx="7.4605465" />
+    <radialGradient
+       r="62.769119"
+       fy="-500.58121"
+       fx="-150.24731"
+       cy="-500.58121"
+       cx="-150.24731"
+       gradientTransform="matrix(0.78392881,0,0,0.24299389,181.87534,233.6299)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3163-0-2-6"
+       xlink:href="#linearGradient3820-7-2-8-6" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4189"
+       id="linearGradient4195"
+       x1="71.374176"
+       y1="40.012909"
+       x2="71.374176"
+       y2="97.085487"
+       gradientUnits="userSpaceOnUse" />
  </defs>
  <metadata
     id="metadata5649">
@@ -124,135 +209,149 @@
        <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>
+  <path
+     inkscape:connector-curvature="0"
+     d="m 108.18623,109.00945 a 44.186236,13.804854 0 0 1 -88.372457,0 44.186236,13.804854 0 1 1 88.372457,0 z"
+     id="path3818-0-5-0-4"
+     style="fill:url(#radialGradient3163-0-2);fill-opacity:1;stroke:none" />
  <g
-     transform="translate(0,-924.3622)"
-     id="layer1">
+     transform="matrix(0.31548205,0,0,0.31680676,-266.02134,-79.894447)"
+     id="g4992">
    <path
-       style="fill:url(#radialGradient3163-0-2);fill-opacity:1;stroke:none"
-       id="path3818-0-5-0-4"
-       d="m 114.07434,1036.2828 a 50.074345,15.644442 0 0 1 -100.148682,0 50.074345,15.644442 0 1 1 100.148682,0 z" />
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#f2ec39;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 878.63707,891.61951 A 164.44035,164.44035 0 0 1 714.19672,1056.0599 164.44035,164.44035 0 0 1 549.75636,891.61951 164.44035,164.44035 0 0 1 714.19672,727.17915 164.44035,164.44035 0 0 1 878.63707,891.61951 Z"
+       id="path8272-96-8-29-8"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#f9ba13;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 791.39679,746.42729 a 164.44035,164.44035 0 0 1 65.20945,62.97204 l -142.40952,82.22018 z"
+       id="path8272-5-7-5-1-4"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#f89a22;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 708.45783,727.27933 a 164.44035,164.44035 0 0 1 87.95907,21.93066 l -82.22018,142.40952 z"
+       id="path8272-5-6-6-4-2-5"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#ef5725;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 627.0566,752.16618 a 164.44035,164.44035 0 0 1 87.14012,-24.98703 l 0,164.44036 z"
+       id="path8272-5-6-9-29-5-7-0"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#ec3425;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 569.0045,814.41944 a 164.44035,164.44035 0 0 1 62.97204,-65.20946 l 82.22018,142.40953 z"
+       id="path8272-5-6-9-6-82-5-0-3"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#a61d4c;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 549.85654,897.35839 a 164.44035,164.44035 0 0 1 21.93065,-87.95906 l 142.40953,82.22018 z"
+       id="path8272-5-6-9-6-3-9-2-9-6"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#7d3693;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 574.74339,978.75962 A 164.44035,164.44035 0 0 1 549.75636,891.6195 l 164.44036,10e-6 z"
+       id="path8272-5-6-9-6-3-0-15-5-3-1"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#47318f;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 636.99665,1036.8117 A 164.44035,164.44035 0 0 1 571.78719,973.83968 L 714.19672,891.61951 Z"
+       id="path8272-5-6-9-6-3-0-8-6-7-6-0"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#3e5daa;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 719.93561,1055.9597 A 164.44035,164.44035 0 0 1 631.97654,1034.029 L 714.19672,891.61951 Z"
+       id="path8272-5-6-9-6-3-0-8-5-1-5-0-6"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#1892cd;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 801.33682,1031.0728 a 164.44035,164.44035 0 0 1 -87.1401,24.9871 l 0,-164.44039 z"
+       id="path8272-5-6-9-6-3-0-8-5-4-9-4-62-3"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#63ae45;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 859.38893,968.81958 A 164.44035,164.44035 0 0 1 796.41689,1034.029 L 714.19672,891.61951 Z"
+       id="path8272-5-6-9-6-3-0-8-5-4-4-9-8-61-2"
+       inkscape:connector-curvature="0" />
+    <path
+       transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
+       style="fill:#cedd38;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 878.63707,891.61951 a 164.44035,164.44035 0 0 1 -22.03083,82.22017 L 714.19672,891.61951 Z"
+       id="path8272-5-6-9-6-3-0-8-5-4-4-3-69-0-8-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#000000;stroke-width:5.62718296;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1210.0349,459.59296 A 163.94891,163.94891 0 0 1 1046.0859,623.54187 163.94891,163.94891 0 0 1 882.13702,459.59296 163.94891,163.94891 0 0 1 1046.0859,295.64404 163.94891,163.94891 0 0 1 1210.0349,459.59296 Z"
+       id="path8089-1-7-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.02979922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1206.0136,459.09299 A 159.92764,159.92764 0 0 1 1046.0859,619.02063 159.92764,159.92764 0 0 1 886.15829,459.09299 159.92764,159.92764 0 0 1 1046.0859,299.16534 159.92764,159.92764 0 0 1 1206.0136,459.09299 Z"
+       id="path8089-1-3-92-1"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     style="opacity:0.05;fill:#000000;fill-opacity:1"
+     id="g8243-2-7-4"
+     transform="matrix(0.25099333,0.25204725,-0.25099333,0.25204725,49.82923,-183.15957)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
+       id="rect8140-3-36-5" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
+       id="rect8172-9-2-12-2" />
+  </g>
+  <g
+     style="opacity:0.15;fill:#000000;fill-opacity:1"
+     id="g8243-2-7-5"
+     transform="matrix(0.24438711,0.24541328,-0.24438711,0.24541328,50.202209,-177.27309)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
+       id="rect8140-3-36-4" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
+       id="rect8172-9-2-12-7" />
+  </g>
+  <g
+     id="g4667"
+     transform="matrix(0.95399968,0,0,0.95399968,-3.7442232,0.37868768)"
+     style="fill-opacity:1;fill:url(#linearGradient4195)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4195);fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 97.330311,42.284792 a 7.0356347,7.1986844 39.729891 0 0 -3.278971,-1.929288 7.0356347,7.1986844 39.729891 0 0 -6.812034,1.857219 l -0.0015,-0.0015 -6.337307,6.363917 -2.41292,-2.423051 c -1.365731,-1.371466 -3.564848,-1.371466 -4.930579,0 -1.365732,1.371466 -1.365732,3.579818 0,4.951284 l 14.756822,14.818785 c 1.365732,1.371467 3.56485,1.371467 4.930581,0 1.365731,-1.371466 1.365731,-3.579816 0,-4.951282 l -2.41292,-2.423052 6.337307,-6.363916 -0.0034,-0.0034 a 7.0356347,7.1986844 39.729891 0 0 1.851392,-6.838692 7.0356347,7.1986844 39.729891 0 0 -1.686523,-3.057054 z"
+       id="rect8140-3-36" />
    <g
-       transform="matrix(1.0804281,0,0,1.0849648,-5.3620206,-87.639944)"
-       id="g6725">
-      <g
-         transform="matrix(0.33090784,0,0,0.33090784,-281.9594,838.59505)"
-         id="g4992">
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f2ec39;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 878.63707,891.61951 A 164.44035,164.44035 0 0 1 714.19672,1056.0599 164.44035,164.44035 0 0 1 549.75636,891.61951 164.44035,164.44035 0 0 1 714.19672,727.17915 164.44035,164.44035 0 0 1 878.63707,891.61951 Z"
-           id="path8272-96-8-29-8" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f9ba13;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 791.39679,746.42729 a 164.44035,164.44035 0 0 1 65.20945,62.97204 l -142.40952,82.22018 z"
-           id="path8272-5-7-5-1-4" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f89a22;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 708.45783,727.27933 a 164.44035,164.44035 0 0 1 87.95907,21.93066 l -82.22018,142.40952 z"
-           id="path8272-5-6-6-4-2-5" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#ef5725;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 627.0566,752.16618 a 164.44035,164.44035 0 0 1 87.14012,-24.98703 l 0,164.44036 z"
-           id="path8272-5-6-9-29-5-7-0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#ec3425;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 569.0045,814.41944 a 164.44035,164.44035 0 0 1 62.97204,-65.20946 l 82.22018,142.40953 z"
-           id="path8272-5-6-9-6-82-5-0-3" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#a61d4c;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 549.85654,897.35839 a 164.44035,164.44035 0 0 1 21.93065,-87.95906 l 142.40953,82.22018 z"
-           id="path8272-5-6-9-6-3-9-2-9-6" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#7d3693;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 574.74339,978.75962 A 164.44035,164.44035 0 0 1 549.75636,891.6195 l 164.44036,10e-6 z"
-           id="path8272-5-6-9-6-3-0-15-5-3-1" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#47318f;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 636.99665,1036.8117 A 164.44035,164.44035 0 0 1 571.78719,973.83968 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-6-7-6-0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#3e5daa;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 719.93561,1055.9597 A 164.44035,164.44035 0 0 1 631.97654,1034.029 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-1-5-0-6" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#1892cd;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 801.33682,1031.0728 a 164.44035,164.44035 0 0 1 -87.1401,24.9871 l 0,-164.44039 z"
-           id="path8272-5-6-9-6-3-0-8-5-4-9-4-62-3" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#63ae45;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 859.38893,968.81958 A 164.44035,164.44035 0 0 1 796.41689,1034.029 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-4-4-9-8-61-2" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#cedd38;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 878.63707,891.61951 a 164.44035,164.44035 0 0 1 -22.03083,82.22017 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-4-4-3-69-0-8-0" />
-        <path
-           style="opacity:0.4;fill:none;fill-opacity:1;stroke:#000000;stroke-width:5.62718296;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 1210.0349,459.59296 A 163.94891,163.94891 0 0 1 1046.0859,623.54187 163.94891,163.94891 0 0 1 882.13702,459.59296 163.94891,163.94891 0 0 1 1046.0859,295.64404 163.94891,163.94891 0 0 1 1210.0349,459.59296 Z"
-           id="path8089-1-7-6" />
-        <path
-           style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.02979922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 1206.0136,459.09299 A 159.92764,159.92764 0 0 1 1046.0859,619.02063 159.92764,159.92764 0 0 1 886.15829,459.09299 159.92764,159.92764 0 0 1 1046.0859,299.16534 159.92764,159.92764 0 0 1 1206.0136,459.09299 Z"
-           id="path8089-1-3-92-1" />
-      </g>
-      <g
-         transform="matrix(0.38831928,0,0,0.38831928,-342.01671,808.82989)"
-         id="g4871">
-        <g
-           transform="matrix(0.71065266,0.71065266,-0.71065266,0.71065266,1005.9634,-230.31972)"
-           id="g8243-2-7-4"
-           style="opacity:0.05;fill:#000000;fill-opacity:1">
-          <path
-             id="rect8140-3-36-5"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             id="rect8172-9-2-12-2"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-        <g
-           transform="matrix(0.69194807,0.69194807,-0.69194807,0.69194807,1007.0195,-216.5247)"
-           id="g8243-2-7-5"
-           style="opacity:0.15;fill:#000000;fill-opacity:1">
-          <path
-             id="rect8140-3-36-4"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             id="rect8172-9-2-12-7"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-        <g
-           transform="matrix(0.67061887,0.67061887,-0.67061887,0.67061887,1008.2237,-200.28301)"
-           id="g8243-2-7"
-           style="fill:#ffffff">
-          <path
-             id="rect8140-3-36"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-          <path
-             id="rect8172-9-2-12"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-        </g>
-      </g>
+       transform="matrix(0.88241267,0,0,0.88241267,14.536297,13.778944)"
+       id="g4284"
+       style="fill-opacity:1;fill:url(#linearGradient4195)">
+      <path
+         id="rect8172-9-2-12"
+         d="m 66.974129,47.701228 -26.992865,27.106208 -0.0077,0.0077 0.0023,0.0023 -7.963775,15.460251 3.818679,3.834713 15.395056,-7.997766 0.0023,0.0023 0.0077,-0.0077 L 78.228591,59.002947 66.974236,47.701336 Z"
+         style="fill:url(#linearGradient4195);fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
    </g>
  </g>
 </svg>
@@ -25,18 +25,31 @@
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="1920"
-     inkscape:window-height="1017"
+     inkscape:window-height="962"
     id="namedview52"
     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="291.03927"
-     inkscape:cy="100.39871"
+     showguides="false"
+     inkscape:zoom="11.313708"
+     inkscape:cx="25.239104"
+     inkscape:cy="9.6894688"
     inkscape:window-x="1600"
     inkscape:window-y="30"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg5644" />
  <defs
     id="defs5646">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4188">
+      <stop
+         style="stop-color:#f7f7f7;stop-opacity:1"
+         offset="0"
+         id="stop4190" />
+      <stop
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="1"
+         id="stop4192" />
+    </linearGradient>
    <radialGradient
       r="62.769119"
       fy="193.04066"
@@ -64,11 +77,11 @@
    </linearGradient>
    <radialGradient
       r="62.769119"
-       fy="-500.58121"
-       fx="-150.24731"
-       cy="-500.58121"
-       cx="-150.24731"
-       gradientTransform="matrix(0.78392881,0,0,0.24299389,181.87534,1157.9921)"
+       fy="-779.76959"
+       fx="-197.5938"
+       cy="-779.76959"
+       cx="-197.5938"
+       gradientTransform="matrix(0.69630612,0,0,0.11886762,169.58821,148.39555)"
       gradientUnits="userSpaceOnUse"
       id="radialGradient3163-0-2"
       xlink:href="#linearGradient3820-7-2-8-6" />
@@ -139,6 +152,105 @@
       gradientUnits="userSpaceOnUse"
       id="radialGradient3163"
       xlink:href="#linearGradient3820-7-2-8-6" />
+    <linearGradient
+       y2="40.495617"
+       x2="71.204407"
+       y1="15.369057"
+       x1="71.204407"
+       gradientTransform="matrix(4.16388,0,0,4.16388,-236.03265,-50.036246)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3118-2"
+       xlink:href="#linearGradient4806" />
+    <radialGradient
+       r="62.769119"
+       fy="186.17059"
+       fx="99.157013"
+       cy="186.17059"
+       cx="99.157013"
+       gradientTransform="matrix(0.6869404,0,0,0.21461693,-4.02174,68.573331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3163-9"
+       xlink:href="#linearGradient3820-7-2-8-6" />
+    <radialGradient
+       gradientTransform="matrix(0,46.861858,-92.320077,0,985.84907,-380.50601)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-8-9"
+       id="radialGradient5521-1-1"
+       fy="9.9571075"
+       fx="6.9303164"
+       r="12.671875"
+       cy="9.9571075"
+       cx="7.4605465" />
+    <radialGradient
+       r="62.769119"
+       fy="-500.58121"
+       fx="-150.24731"
+       cy="-500.58121"
+       cx="-150.24731"
+       gradientTransform="matrix(0.78392881,0,0,0.24299389,181.87534,233.6299)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3163-0-2-6"
+       xlink:href="#linearGradient3820-7-2-8-6" />
+    <radialGradient
+       xlink:href="#linearGradient23419"
+       id="radialGradient3300-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52432058,1.0360946e-7,-2.519381e-8,0.15292684,-8.9266939,48.181779)"
+       cx="99.189415"
+       cy="185.29727"
+       fx="99.189415"
+       fy="185.29727"
+       r="62.769119" />
+    <linearGradient
+       id="linearGradient23419">
+      <stop
+         id="stop23421"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop23423"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient23419"
+       id="radialGradient4192"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.34954706,7.4005314e-8,-1.6795874e-8,0.10923133,8.4089892,59.021636)"
+       cx="99.189415"
+       cy="185.29727"
+       fx="99.189415"
+       fy="185.29727"
+       r="62.769119" />
+    <radialGradient
+       cx="99.157013"
+       cy="178.78207"
+       r="62.769119"
+       fx="99.157013"
+       fy="178.78207"
+       id="radialGradient3018"
+       xlink:href="#linearGradient3820-7-2-8-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.27083381,0,0,0.08762273,-2.8550719,25.187228)" />
+    <radialGradient
+       cx="99.157013"
+       cy="186.17059"
+       r="62.769119"
+       fx="99.157013"
+       fy="186.17059"
+       id="radialGradient3043"
+       xlink:href="#linearGradient3820-7-2-8-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.17524541,0,0,0.05575992,-1.3768094,18.119145)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4188"
+       id="linearGradient4194"
+       x1="71.341965"
+       y1="40.114685"
+       x2="71.341965"
+       y2="96.856537"
+       gradientUnits="userSpaceOnUse" />
  </defs>
  <metadata
     id="metadata5649">
@@ -148,156 +260,136 @@
        <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>
+  <path
+     inkscape:connector-curvature="0"
+     d="m 27,28.464466 a 11,3.5 0 0 1 -22.0000002,0 11,3.5 0 1 1 22.0000002,0 z"
+     id="path3818-0-2"
+     style="fill:url(#radialGradient3043);fill-opacity:1;stroke:none" />
  <g
-     transform="matrix(0.24821801,0,0,0.24821801,0.11404737,-229.51227)"
-     id="layer1">
+     id="g4213">
    <path
-       style="fill:url(#radialGradient3163-0-2);fill-opacity:1;stroke:none"
-       id="path3818-0-5-0-4"
-       d="m 114.07434,1036.2828 a 50.074345,15.644442 0 0 1 -100.148682,0 50.074345,15.644442 0 1 1 100.148682,0 z"
+       style="fill:#f2ec39;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 19.646727,30.236112 A 14.572815,14.63401 0 0 0 29.951267,12.313182 14.572815,14.63401 0 0 0 12.103282,1.9653748 14.572815,14.63401 0 0 0 1.7987451,19.888306 14.572815,14.63401 0 0 0 19.646727,30.236112 Z"
+       id="path8272-96-8-29-8"
       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#f9ba13;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 5.2171216,26.081116 a 14.572815,14.63401 0 0 0 6.8861604,4.154997 l 3.771723,-14.135369 z"
+       id="path8272-5-7-5-1-4"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#f89a22;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 1.6756893,19.39268 a 14.572815,14.63401 0 0 0 3.8947791,7.055872 L 15.875005,16.100744 Z"
+       id="path8272-5-6-6-4-2-5"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ef5725;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 1.9389513,11.822173 A 14.572815,14.63401 0 0 0 1.7987451,19.888306 L 15.875005,16.100744 Z"
+       id="path8272-5-6-9-29-5-7-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ec3425;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 5.9363679,5.398106 a 14.572815,14.63401 0 0 0 -4.137623,6.915078 l 14.0762601,3.78756 z"
+       id="path8272-5-6-9-6-82-5-0-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#a61d4c;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 12.596833,1.8418024 A 14.572815,14.63401 0 0 0 5.5704673,5.7529357 L 15.875005,16.100744 Z"
+       id="path8272-5-6-9-6-3-9-2-9-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#7d3693;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 20.135684,2.1061699 A 14.572815,14.63401 0 0 0 12.103281,1.965375 l 3.771724,14.135369 z"
+       id="path8272-5-6-9-6-3-0-15-5-3-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#47318f;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 26.532885,6.1203729 A 14.572815,14.63401 0 0 0 19.646726,1.9653747 L 15.875005,16.100744 Z"
+       id="path8272-5-6-9-6-3-0-8-6-7-6-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#3e5daa;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 30.074321,12.808808 A 14.572815,14.63401 0 0 0 26.179539,5.752936 L 15.875005,16.100744 Z"
+       id="path8272-5-6-9-6-3-0-8-5-1-5-0-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#1892cd;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 29.811055,20.379314 a 14.572815,14.63401 0 0 0 0.140212,-8.066132 l -14.076262,3.787562 z"
+       id="path8272-5-6-9-6-3-0-8-5-4-9-4-62-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#63ae45;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 25.813642,26.803381 a 14.572815,14.63401 0 0 0 4.137619,-6.915076 L 15.875005,16.100744 Z"
+       id="path8272-5-6-9-6-3-0-8-5-4-4-9-8-61-2"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#cedd38;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 19.646727,30.236112 a 14.572815,14.63401 0 0 0 6.532814,-3.787561 L 15.875005,16.100744 Z"
+       id="path8272-5-6-9-6-3-0-8-5-4-4-3-69-0-8-0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     id="path8089-1-7-6"
+     d="M 30.559363,16.113993 A 14.55936,14.620498 0 0 1 15.999995,30.73449 14.55936,14.620498 0 0 1 1.4406371,16.113993 14.55936,14.620498 0 0 1 15.999995,1.4934938 14.55936,14.620498 0 0 1 30.559363,16.113993 Z"
+     style="opacity:0.4;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.99380356;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path8089-1-3-92-1"
+     d="M 29.572484,16.099792 A 13.572483,13.629476 0 0 1 15.999996,29.729268 13.572483,13.629476 0 0 1 2.4275157,16.099792 13.572483,13.629476 0 0 1 15.999996,2.4703151 13.572483,13.629476 0 0 1 29.572484,16.099792 Z"
+     style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99558651;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     style="opacity:0.05;fill:#000000;fill-opacity:1"
+     id="g8243-2-7-4"
+     transform="matrix(0.06885171,0.06914083,-0.06885171,0.06914083,12.112718,-51.214615)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
+       id="rect8140-3-36-5" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
+       id="rect8172-9-2-12-2" />
+  </g>
+  <g
+     style="opacity:0.15;fill:#000000;fill-opacity:1"
+     id="g8243-2-7-5"
+     transform="matrix(0.06703951,0.067321,-0.06703951,0.067321,12.215032,-50.115907)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
+       id="rect8140-3-36-4" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
+       id="rect8172-9-2-12-7" />
+  </g>
+  <g
+     id="g4667"
+     transform="matrix(0.26169823,0,0,0.26169823,-2.5833858,-1.920854)"
+     style="fill-opacity:1;fill:url(#linearGradient4194)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4194);fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 97.330311,42.284792 a 7.0356347,7.1986844 39.729891 0 0 -3.278971,-1.929288 7.0356347,7.1986844 39.729891 0 0 -6.812034,1.857219 l -0.0015,-0.0015 -6.337307,6.363917 -2.41292,-2.423051 c -1.365731,-1.371466 -3.564848,-1.371466 -4.930579,0 -1.365732,1.371466 -1.365732,3.579818 0,4.951284 l 14.756822,14.818785 c 1.365732,1.371467 3.56485,1.371467 4.930581,0 1.365731,-1.371466 1.365731,-3.579816 0,-4.951282 l -2.41292,-2.423052 6.337307,-6.363916 -0.0034,-0.0034 a 7.0356347,7.1986844 39.729891 0 0 1.851392,-6.838692 7.0356347,7.1986844 39.729891 0 0 -1.686523,-3.057054 z"
+       id="rect8140-3-36" />
    <g
-       transform="matrix(1.0804281,0,0,1.0849648,-5.3620206,-87.639944)"
-       id="g6725">
-      <g
-         transform="matrix(0.33090784,0,0,0.33090784,-281.9594,838.59505)"
-         id="g4992">
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f2ec39;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 878.63707,891.61951 A 164.44035,164.44035 0 0 1 714.19672,1056.0599 164.44035,164.44035 0 0 1 549.75636,891.61951 164.44035,164.44035 0 0 1 714.19672,727.17915 164.44035,164.44035 0 0 1 878.63707,891.61951 Z"
-           id="path8272-96-8-29-8"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f9ba13;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 791.39679,746.42729 a 164.44035,164.44035 0 0 1 65.20945,62.97204 l -142.40952,82.22018 z"
-           id="path8272-5-7-5-1-4"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f89a22;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 708.45783,727.27933 a 164.44035,164.44035 0 0 1 87.95907,21.93066 l -82.22018,142.40952 z"
-           id="path8272-5-6-6-4-2-5"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#ef5725;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 627.0566,752.16618 a 164.44035,164.44035 0 0 1 87.14012,-24.98703 l 0,164.44036 z"
-           id="path8272-5-6-9-29-5-7-0"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#ec3425;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 569.0045,814.41944 a 164.44035,164.44035 0 0 1 62.97204,-65.20946 l 82.22018,142.40953 z"
-           id="path8272-5-6-9-6-82-5-0-3"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#a61d4c;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 549.85654,897.35839 a 164.44035,164.44035 0 0 1 21.93065,-87.95906 l 142.40953,82.22018 z"
-           id="path8272-5-6-9-6-3-9-2-9-6"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#7d3693;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 574.74339,978.75962 A 164.44035,164.44035 0 0 1 549.75636,891.6195 l 164.44036,10e-6 z"
-           id="path8272-5-6-9-6-3-0-15-5-3-1"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#47318f;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 636.99665,1036.8117 A 164.44035,164.44035 0 0 1 571.78719,973.83968 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-6-7-6-0"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#3e5daa;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 719.93561,1055.9597 A 164.44035,164.44035 0 0 1 631.97654,1034.029 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-1-5-0-6"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#1892cd;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 801.33682,1031.0728 a 164.44035,164.44035 0 0 1 -87.1401,24.9871 l 0,-164.44039 z"
-           id="path8272-5-6-9-6-3-0-8-5-4-9-4-62-3"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#63ae45;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 859.38893,968.81958 A 164.44035,164.44035 0 0 1 796.41689,1034.029 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-4-4-9-8-61-2"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#cedd38;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 878.63707,891.61951 a 164.44035,164.44035 0 0 1 -22.03083,82.22017 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-4-4-3-69-0-8-0"
-           inkscape:connector-curvature="0" />
-        <path
-           style="opacity:0.4;fill:none;fill-opacity:1;stroke:#000000;stroke-width:5.62718296;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 1210.0349,459.59296 A 163.94891,163.94891 0 0 1 1046.0859,623.54187 163.94891,163.94891 0 0 1 882.13702,459.59296 163.94891,163.94891 0 0 1 1046.0859,295.64404 163.94891,163.94891 0 0 1 1210.0349,459.59296 Z"
-           id="path8089-1-7-6"
-           inkscape:connector-curvature="0" />
-        <path
-           style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.02979922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 1206.0136,459.09299 A 159.92764,159.92764 0 0 1 1046.0859,619.02063 159.92764,159.92764 0 0 1 886.15829,459.09299 159.92764,159.92764 0 0 1 1046.0859,299.16534 159.92764,159.92764 0 0 1 1206.0136,459.09299 Z"
-           id="path8089-1-3-92-1"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="matrix(0.38831928,0,0,0.38831928,-342.01671,808.82989)"
-         id="g4871">
-        <g
-           transform="matrix(0.71065266,0.71065266,-0.71065266,0.71065266,1005.9634,-230.31972)"
-           id="g8243-2-7-4"
-           style="opacity:0.05;fill:#000000;fill-opacity:1">
-          <path
-             id="rect8140-3-36-5"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-          <path
-             id="rect8172-9-2-12-2"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="matrix(0.69194807,0.69194807,-0.69194807,0.69194807,1007.0195,-216.5247)"
-           id="g8243-2-7-5"
-           style="opacity:0.15;fill:#000000;fill-opacity:1">
-          <path
-             id="rect8140-3-36-4"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-          <path
-             id="rect8172-9-2-12-7"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="matrix(0.67061887,0.67061887,-0.67061887,0.67061887,1008.2237,-200.28301)"
-           id="g8243-2-7"
-           style="fill:#ffffff">
-          <path
-             id="rect8140-3-36"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-          <path
-             id="rect8172-9-2-12"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
+       transform="matrix(0.88241267,0,0,0.88241267,14.536297,13.778944)"
+       id="g4284"
+       style="fill-opacity:1;fill:url(#linearGradient4194)">
+      <path
+         id="rect8172-9-2-12"
+         d="m 66.974129,47.701228 -26.992865,27.106208 -0.0077,0.0077 0.0023,0.0023 -7.963775,15.460251 3.818679,3.834713 15.395056,-7.997766 0.0023,0.0023 0.0077,-0.0077 L 78.228591,59.002947 66.974236,47.701336 Z"
+         style="fill:url(#linearGradient4194);fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
    </g>
  </g>
 </svg>
@@ -25,18 +25,31 @@
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="1920"
-     inkscape:window-height="1017"
+     inkscape:window-height="962"
     id="namedview52"
     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="88.586202"
-     inkscape:cy="47.302641"
+     showguides="false"
+     inkscape:zoom="0.99999996"
+     inkscape:cx="177.80714"
+     inkscape:cy="48.432504"
     inkscape:window-x="1600"
     inkscape:window-y="30"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg5644" />
  <defs
     id="defs5646">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4187">
+      <stop
+         style="stop-color:#f7f7f7;stop-opacity:1"
+         offset="0"
+         id="stop4189" />
+      <stop
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="1"
+         id="stop4191" />
+    </linearGradient>
    <radialGradient
       r="62.769119"
       fy="193.04066"
@@ -64,11 +77,11 @@
    </linearGradient>
    <radialGradient
       r="62.769119"
-       fy="-500.58121"
-       fx="-150.24731"
-       cy="-500.58121"
-       cx="-150.24731"
-       gradientTransform="matrix(0.78392881,0,0,0.24299389,181.87534,1157.9921)"
+       fy="-779.76959"
+       fx="-197.5938"
+       cy="-779.76959"
+       cx="-197.5938"
+       gradientTransform="matrix(0.69630612,0,0,0.11886762,169.58821,148.39555)"
       gradientUnits="userSpaceOnUse"
       id="radialGradient3163-0-2"
       xlink:href="#linearGradient3820-7-2-8-6" />
@@ -139,6 +152,95 @@
       gradientUnits="userSpaceOnUse"
       id="radialGradient3163"
       xlink:href="#linearGradient3820-7-2-8-6" />
+    <linearGradient
+       y2="40.495617"
+       x2="71.204407"
+       y1="15.369057"
+       x1="71.204407"
+       gradientTransform="matrix(4.16388,0,0,4.16388,-236.03265,-50.036246)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3118-2"
+       xlink:href="#linearGradient4806" />
+    <radialGradient
+       r="62.769119"
+       fy="186.17059"
+       fx="99.157013"
+       cy="186.17059"
+       cx="99.157013"
+       gradientTransform="matrix(0.6869404,0,0,0.21461693,-4.02174,68.573331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3163-9"
+       xlink:href="#linearGradient3820-7-2-8-6" />
+    <radialGradient
+       gradientTransform="matrix(0,46.861858,-92.320077,0,985.84907,-380.50601)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-8-9"
+       id="radialGradient5521-1-1"
+       fy="9.9571075"
+       fx="6.9303164"
+       r="12.671875"
+       cy="9.9571075"
+       cx="7.4605465" />
+    <radialGradient
+       r="62.769119"
+       fy="-500.58121"
+       fx="-150.24731"
+       cy="-500.58121"
+       cx="-150.24731"
+       gradientTransform="matrix(0.78392881,0,0,0.24299389,181.87534,233.6299)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3163-0-2-6"
+       xlink:href="#linearGradient3820-7-2-8-6" />
+    <radialGradient
+       xlink:href="#linearGradient23419"
+       id="radialGradient3300-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.52432058,1.0360946e-7,-2.519381e-8,0.15292684,-8.9266939,48.181779)"
+       cx="99.189415"
+       cy="185.29727"
+       fx="99.189415"
+       fy="185.29727"
+       r="62.769119" />
+    <linearGradient
+       id="linearGradient23419">
+      <stop
+         id="stop23421"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop23423"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient23419"
+       id="radialGradient4192"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.34954706,7.4005314e-8,-1.6795874e-8,0.10923133,8.4089892,59.021636)"
+       cx="99.189415"
+       cy="185.29727"
+       fx="99.189415"
+       fy="185.29727"
+       r="62.769119" />
+    <radialGradient
+       cx="99.157013"
+       cy="187.86072"
+       r="62.769119"
+       fx="99.157013"
+       fy="187.86072"
+       id="radialGradient3018"
+       xlink:href="#linearGradient3820-7-2-8-6"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.27083381,0,0,0.08762273,-2.8550719,25.187228)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4187"
+       id="linearGradient4193"
+       x1="71.34787"
+       y1="40.12112"
+       x2="71.34787"
+       y2="96.729141"
+       gradientUnits="userSpaceOnUse" />
  </defs>
  <metadata
     id="metadata5649">
@@ -148,156 +250,137 @@
        <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>
+  <path
+     inkscape:connector-curvature="0"
+     d="m 41,41.674434 a 17,5.4999999 0 0 1 -33.9999999,0 17,5.4999999 0 1 1 33.9999999,0 z"
+     id="path3818-0-5"
+     style="fill:url(#radialGradient3018);fill-opacity:1;stroke:none" />
  <g
-     transform="matrix(0.37380971,0,0,0.37380971,0.07617858,-345.62481)"
-     id="layer1">
+     id="g4220"
+     transform="matrix(0.9961876,0,0,0.9961876,0.09148266,0.35859843)">
    <path
-       style="fill:url(#radialGradient3163-0-2);fill-opacity:1;stroke:none"
-       id="path3818-0-5-0-4"
-       d="m 114.07434,1036.2828 a 50.074345,15.644442 0 0 1 -100.148682,0 50.074345,15.644442 0 1 1 100.148682,0 z"
+       style="fill:#f2ec39;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 29.314755,43.762237 A 20.534583,20.62081 0 0 0 43.834902,18.507005 20.534583,20.62081 0 0 0 18.685271,3.9258899 20.534583,20.62081 0 0 0 4.1651283,29.181122 20.534583,20.62081 0 0 0 29.314755,43.762237 Z"
+       id="path8272-96-8-29-8"
       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#f9ba13;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 8.9819695,37.907423 a 20.534583,20.62081 0 0 0 9.7033025,5.854814 l 5.314741,-19.918173 z"
+       id="path8272-5-7-5-1-4"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#f89a22;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3.9917301,28.482736 a 20.534583,20.62081 0 0 0 5.488141,9.942443 L 24.000013,23.844064 Z"
+       id="path8272-5-6-6-4-2-5"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ef5725;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 4.362693,17.815121 A 20.534583,20.62081 0 0 0 4.1651283,29.181122 L 24.000013,23.844064 Z"
+       id="path8272-5-6-9-29-5-7-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ec3425;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 9.9954605,8.7629571 A 20.534583,20.62081 0 0 0 4.1651279,18.507005 l 19.8348851,5.337059 z"
+       id="path8272-5-6-9-6-82-5-0-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#a61d4c;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 19.380736,3.7517639 A 20.534583,20.62081 0 0 0 9.4798692,9.2629482 L 24.000013,23.844064 Z"
+       id="path8272-5-6-9-6-3-9-2-9-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#7d3693;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 30.003744,4.124285 A 20.534583,20.62081 0 0 0 18.68527,3.9258902 l 5.314743,19.9181738 z"
+       id="path8272-5-6-9-6-3-0-15-5-3-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#47318f;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 39.018054,9.7807062 A 20.534583,20.62081 0 0 0 29.314753,3.9258903 l -5.31474,19.9181737 z"
+       id="path8272-5-6-9-6-3-0-8-6-7-6-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#3e5daa;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 44.008298,19.205392 A 20.534583,20.62081 0 0 0 38.520152,9.2629502 L 24.000013,23.844064 Z"
+       id="path8272-5-6-9-6-3-0-8-5-1-5-0-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#1892cd;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 43.637328,29.873006 A 20.534583,20.62081 0 0 0 43.834902,18.507005 L 24.000013,23.844064 Z"
+       id="path8272-5-6-9-6-3-0-8-5-4-9-4-62-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#63ae45;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 38.004566,38.92517 a 20.534583,20.62081 0 0 0 5.830328,-9.744047 L 24.000013,23.844064 Z"
+       id="path8272-5-6-9-6-3-0-8-5-4-4-9-8-61-2"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#cedd38;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 29.314755,43.762237 a 20.534583,20.62081 0 0 0 9.205401,-5.337058 L 24.000013,23.844064 Z"
+       id="path8272-5-6-9-6-3-0-8-5-4-4-3-69-0-8-0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     id="path8089-1-7-6"
+     d="M 44.4469,24.111757 A 20.446897,20.532755 0 0 1 23.999994,44.644512 20.446897,20.532755 0 0 1 3.5531,24.111757 20.446897,20.532755 0 0 1 23.999994,3.5790005 20.446897,20.532755 0 0 1 44.4469,24.111757 Z"
+     style="opacity:0.4;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.00719976;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path8089-1-3-92-1"
+     d="M 43.45966,24.094408 A 19.459657,19.541371 0 0 1 23.999994,43.63578 19.459657,19.541371 0 0 1 4.5403399,24.094408 19.459657,19.541371 0 0 1 23.999994,4.5530392 19.459657,19.541371 0 0 1 43.45966,24.094408 Z"
+     style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.98094463;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     style="opacity:0.05;fill:#000000;fill-opacity:1"
+     id="g8243-2-7-4"
+     transform="matrix(0.10146774,0.10189382,-0.10146774,0.10189382,18.271257,-75.503807)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
+       id="rect8140-3-36-5" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
+       id="rect8172-9-2-12-2" />
+  </g>
+  <g
+     style="opacity:0.15;fill:#000000;fill-opacity:1"
+     id="g8243-2-7-5"
+     transform="matrix(0.09879708,0.09921193,-0.09879708,0.09921193,18.422039,-73.695316)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
+       id="rect8140-3-36-4" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
+       id="rect8172-9-2-12-7" />
+  </g>
+  <g
+     id="g4667"
+     transform="matrix(0.38566838,0,0,0.38566838,-3.3865983,-2.2984577)"
+     style="fill-opacity:1;fill:url(#linearGradient4193)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4193);fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 97.330311,42.284792 a 7.0356347,7.1986844 39.729891 0 0 -3.278971,-1.929288 7.0356347,7.1986844 39.729891 0 0 -6.812034,1.857219 l -0.0015,-0.0015 -6.337307,6.363917 -2.41292,-2.423051 c -1.365731,-1.371466 -3.564848,-1.371466 -4.930579,0 -1.365732,1.371466 -1.365732,3.579818 0,4.951284 l 14.756822,14.818785 c 1.365732,1.371467 3.56485,1.371467 4.930581,0 1.365731,-1.371466 1.365731,-3.579816 0,-4.951282 l -2.41292,-2.423052 6.337307,-6.363916 -0.0034,-0.0034 a 7.0356347,7.1986844 39.729891 0 0 1.851392,-6.838692 7.0356347,7.1986844 39.729891 0 0 -1.686523,-3.057054 z"
+       id="rect8140-3-36" />
    <g
-       transform="matrix(1.0804281,0,0,1.0849648,-5.3620206,-87.639944)"
-       id="g6725">
-      <g
-         transform="matrix(0.33090784,0,0,0.33090784,-281.9594,838.59505)"
-         id="g4992">
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f2ec39;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 878.63707,891.61951 A 164.44035,164.44035 0 0 1 714.19672,1056.0599 164.44035,164.44035 0 0 1 549.75636,891.61951 164.44035,164.44035 0 0 1 714.19672,727.17915 164.44035,164.44035 0 0 1 878.63707,891.61951 Z"
-           id="path8272-96-8-29-8"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f9ba13;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 791.39679,746.42729 a 164.44035,164.44035 0 0 1 65.20945,62.97204 l -142.40952,82.22018 z"
-           id="path8272-5-7-5-1-4"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f89a22;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 708.45783,727.27933 a 164.44035,164.44035 0 0 1 87.95907,21.93066 l -82.22018,142.40952 z"
-           id="path8272-5-6-6-4-2-5"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#ef5725;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 627.0566,752.16618 a 164.44035,164.44035 0 0 1 87.14012,-24.98703 l 0,164.44036 z"
-           id="path8272-5-6-9-29-5-7-0"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#ec3425;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 569.0045,814.41944 a 164.44035,164.44035 0 0 1 62.97204,-65.20946 l 82.22018,142.40953 z"
-           id="path8272-5-6-9-6-82-5-0-3"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#a61d4c;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 549.85654,897.35839 a 164.44035,164.44035 0 0 1 21.93065,-87.95906 l 142.40953,82.22018 z"
-           id="path8272-5-6-9-6-3-9-2-9-6"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#7d3693;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 574.74339,978.75962 A 164.44035,164.44035 0 0 1 549.75636,891.6195 l 164.44036,10e-6 z"
-           id="path8272-5-6-9-6-3-0-15-5-3-1"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#47318f;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 636.99665,1036.8117 A 164.44035,164.44035 0 0 1 571.78719,973.83968 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-6-7-6-0"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#3e5daa;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 719.93561,1055.9597 A 164.44035,164.44035 0 0 1 631.97654,1034.029 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-1-5-0-6"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#1892cd;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 801.33682,1031.0728 a 164.44035,164.44035 0 0 1 -87.1401,24.9871 l 0,-164.44039 z"
-           id="path8272-5-6-9-6-3-0-8-5-4-9-4-62-3"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#63ae45;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 859.38893,968.81958 A 164.44035,164.44035 0 0 1 796.41689,1034.029 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-4-4-9-8-61-2"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#cedd38;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 878.63707,891.61951 a 164.44035,164.44035 0 0 1 -22.03083,82.22017 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-4-4-3-69-0-8-0"
-           inkscape:connector-curvature="0" />
-        <path
-           style="opacity:0.4;fill:none;fill-opacity:1;stroke:#000000;stroke-width:5.62718296;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 1210.0349,459.59296 A 163.94891,163.94891 0 0 1 1046.0859,623.54187 163.94891,163.94891 0 0 1 882.13702,459.59296 163.94891,163.94891 0 0 1 1046.0859,295.64404 163.94891,163.94891 0 0 1 1210.0349,459.59296 Z"
-           id="path8089-1-7-6"
-           inkscape:connector-curvature="0" />
-        <path
-           style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.02979922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 1206.0136,459.09299 A 159.92764,159.92764 0 0 1 1046.0859,619.02063 159.92764,159.92764 0 0 1 886.15829,459.09299 159.92764,159.92764 0 0 1 1046.0859,299.16534 159.92764,159.92764 0 0 1 1206.0136,459.09299 Z"
-           id="path8089-1-3-92-1"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="matrix(0.38831928,0,0,0.38831928,-342.01671,808.82989)"
-         id="g4871">
-        <g
-           transform="matrix(0.71065266,0.71065266,-0.71065266,0.71065266,1005.9634,-230.31972)"
-           id="g8243-2-7-4"
-           style="opacity:0.05;fill:#000000;fill-opacity:1">
-          <path
-             id="rect8140-3-36-5"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-          <path
-             id="rect8172-9-2-12-2"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="matrix(0.69194807,0.69194807,-0.69194807,0.69194807,1007.0195,-216.5247)"
-           id="g8243-2-7-5"
-           style="opacity:0.15;fill:#000000;fill-opacity:1">
-          <path
-             id="rect8140-3-36-4"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-          <path
-             id="rect8172-9-2-12-7"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="matrix(0.67061887,0.67061887,-0.67061887,0.67061887,1008.2237,-200.28301)"
-           id="g8243-2-7"
-           style="fill:#ffffff">
-          <path
-             id="rect8140-3-36"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-          <path
-             id="rect8172-9-2-12"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
+       transform="matrix(0.88241267,0,0,0.88241267,14.536297,13.778944)"
+       id="g4284"
+       style="fill-opacity:1;fill:url(#linearGradient4193)">
+      <path
+         id="rect8172-9-2-12"
+         d="m 66.974129,47.701228 -26.992865,27.106208 -0.0077,0.0077 0.0023,0.0023 -7.963775,15.460251 3.818679,3.834713 15.395056,-7.997766 0.0023,0.0023 0.0077,-0.0077 L 78.228591,59.002947 66.974236,47.701336 Z"
+         style="fill:url(#linearGradient4193);fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
    </g>
  </g>
 </svg>
@@ -25,18 +25,31 @@
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
     inkscape:window-width="1920"
-     inkscape:window-height="1017"
+     inkscape:window-height="962"
     id="namedview52"
     showgrid="false"
-     inkscape:zoom="1"
-     inkscape:cx="-124.0191"
-     inkscape:cy="94.813788"
+     showguides="false"
+     inkscape:zoom="7.38"
+     inkscape:cx="8.5246546"
+     inkscape:cy="29.967076"
     inkscape:window-x="1600"
     inkscape:window-y="30"
     inkscape:window-maximized="1"
     inkscape:current-layer="svg5644" />
  <defs
     id="defs5646">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4196">
+      <stop
+         style="stop-color:#f7f7f7;stop-opacity:1"
+         offset="0"
+         id="stop4198" />
+      <stop
+         style="stop-color:#f2f2f2;stop-opacity:1"
+         offset="1"
+         id="stop4200" />
+    </linearGradient>
    <radialGradient
       r="62.769119"
       fy="193.04066"
@@ -64,11 +77,11 @@
    </linearGradient>
    <radialGradient
       r="62.769119"
-       fy="-500.58121"
-       fx="-150.24731"
-       cy="-500.58121"
-       cx="-150.24731"
-       gradientTransform="matrix(0.78392881,0,0,0.24299389,181.87534,1157.9921)"
+       fy="-779.76959"
+       fx="-197.5938"
+       cy="-779.76959"
+       cx="-197.5938"
+       gradientTransform="matrix(0.69630612,0,0,0.11886762,169.58821,148.39555)"
       gradientUnits="userSpaceOnUse"
       id="radialGradient3163-0-2"
       xlink:href="#linearGradient3820-7-2-8-6" />
@@ -139,6 +152,85 @@
       gradientUnits="userSpaceOnUse"
       id="radialGradient3163"
       xlink:href="#linearGradient3820-7-2-8-6" />
+    <linearGradient
+       y2="40.495617"
+       x2="71.204407"
+       y1="15.369057"
+       x1="71.204407"
+       gradientTransform="matrix(4.16388,0,0,4.16388,-236.03265,-50.036246)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3118-2"
+       xlink:href="#linearGradient4806" />
+    <radialGradient
+       r="62.769119"
+       fy="186.17059"
+       fx="99.157013"
+       cy="186.17059"
+       cx="99.157013"
+       gradientTransform="matrix(0.6869404,0,0,0.21461693,-4.02174,68.573331)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3163-9"
+       xlink:href="#linearGradient3820-7-2-8-6" />
+    <radialGradient
+       gradientTransform="matrix(0,46.861858,-92.320077,0,985.84907,-380.50601)"
+       gradientUnits="userSpaceOnUse"
+       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-3-8-8-9"
+       id="radialGradient5521-1-1"
+       fy="9.9571075"
+       fx="6.9303164"
+       r="12.671875"
+       cy="9.9571075"
+       cx="7.4605465" />
+    <radialGradient
+       r="62.769119"
+       fy="-500.58121"
+       fx="-150.24731"
+       cy="-500.58121"
+       cx="-150.24731"
+       gradientTransform="matrix(0.78392881,0,0,0.24299389,181.87534,233.6299)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient3163-0-2-6"
+       xlink:href="#linearGradient3820-7-2-8-6" />
+    <radialGradient
+       xlink:href="#linearGradient23419"
+       id="radialGradient3300-9"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.3823536,7.5555777e-8,-1.8372241e-8,0.1115198,-5.9254279,36.465275)"
+       cx="99.189415"
+       cy="185.29727"
+       fx="99.189415"
+       fy="185.29727"
+       r="62.769119" />
+    <linearGradient
+       id="linearGradient23419">
+      <stop
+         id="stop23421"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop23423"
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       xlink:href="#linearGradient23419"
+       id="radialGradient4192"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.2549024,5.3967361e-8,-1.2248161e-8,0.07965545,6.7163814,44.370092)"
+       cx="99.189415"
+       cy="185.29727"
+       fx="99.189415"
+       fy="185.29727"
+       r="62.769119" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4196"
+       id="linearGradient4202"
+       x1="71.21978"
+       y1="40.17506"
+       x2="71.21978"
+       y2="97.163078"
+       gradientUnits="userSpaceOnUse" />
  </defs>
  <metadata
     id="metadata5649">
@@ -148,156 +240,146 @@
        <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>
  <g
-     transform="matrix(0.49584029,0,0,0.49584029,0.26622146,-458.16812)"
-     id="layer1">
+     transform="translate(1.55e-6,-0.13125855)"
+     id="g4198">
    <path
-       style="fill:url(#radialGradient3163-0-2);fill-opacity:1;stroke:none"
-       id="path3818-0-5-0-4"
-       d="m 114.07434,1036.2828 a 50.074345,15.644442 0 0 1 -100.148682,0 50.074345,15.644442 0 1 1 100.148682,0 z"
+       inkscape:connector-curvature="0"
+       d="m 55.999998,57.0017 a 24,6.9985714 0 1 1 -47.9999991,0 24,6.9985714 0 1 1 47.9999991,0 z"
+       id="path3818-0"
+       style="opacity:0.2;fill:url(#radialGradient3300-9);fill-opacity:1;stroke:none" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.4;fill:url(#radialGradient4192);fill-opacity:1;stroke:none"
+       id="path4190"
+       d="m 47.999998,59.0017 a 16,4.9988822 0 1 1 -31.999999,0 16,4.9988822 0 1 1 31.999999,0 z" />
+  </g>
+  <g
+     id="g4222"
+     transform="matrix(0.9995432,0,0,0.9995432,0.01460828,0.41871028)">
+    <path
+       style="fill:#f2ec39;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 39.616194,60.12505 A 29.426686,29.550249 0 0 0 60.42401,23.933533 29.426686,29.550249 0 0 0 24.38382,3.0383512 29.426686,29.550249 0 0 0 3.5760092,39.229869 29.426686,29.550249 0 0 0 39.616194,60.12505 Z"
+       id="path8272-96-8-29-8"
       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#f9ba13;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 10.47869,51.734923 A 29.426686,29.550249 0 0 0 24.383819,60.12505 L 32.000007,31.581702 Z"
+       id="path8272-5-7-5-1-4"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#f89a22;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.3275243,38.22906 A 29.426686,29.550249 0 0 0 11.192198,52.476884 L 32.000007,31.581702 Z"
+       id="path8272-5-6-6-4-2-5"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ef5725;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 3.8591261,22.942043 A 29.426686,29.550249 0 0 0 3.5760092,39.229869 L 32.000007,31.581702 Z"
+       id="path8272-5-6-9-29-5-7-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ec3425;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 11.931055,9.970016 A 29.426686,29.550249 0 0 0 3.5760093,23.933534 l 28.4239977,7.648168 z"
+       id="path8272-5-6-9-6-82-5-0-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#a61d4c;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 25.380443,2.7888234 A 29.426686,29.550249 0 0 0 11.192197,10.686519 l 20.80781,20.895183 z"
+       id="path8272-5-6-9-6-3-9-2-9-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#7d3693;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 40.603538,3.3226575 A 29.426686,29.550249 0 0 0 24.383819,3.0383517 l 7.616188,28.5433503 z"
+       id="path8272-5-6-9-6-3-0-15-5-3-1"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#47318f;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 53.52132,11.428481 A 29.426686,29.550249 0 0 0 39.616193,3.0383518 L 32.000007,31.581702 Z"
+       id="path8272-5-6-9-6-3-0-8-6-7-6-0"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#3e5daa;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 60.672492,24.934343 A 29.426686,29.550249 0 0 0 52.807811,10.686521 L 32.000007,31.581702 Z"
+       id="path8272-5-6-9-6-3-0-8-5-1-5-0-6"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#1892cd;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 60.14088,40.221359 A 29.426686,29.550249 0 0 0 60.42401,23.933533 L 32.000007,31.581702 Z"
+       id="path8272-5-6-9-6-3-0-8-5-4-9-4-62-3"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#63ae45;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 52.068959,53.193386 A 29.426686,29.550249 0 0 0 60.423998,39.22987 L 32.000007,31.581702 Z"
+       id="path8272-5-6-9-6-3-0-8-5-4-4-9-8-61-2"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#cedd38;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M 39.616194,60.12505 A 29.426686,29.550249 0 0 0 52.807815,52.476884 L 32.000007,31.581702 Z"
+       id="path8272-5-6-9-6-3-0-8-5-4-4-3-69-0-8-0"
+       inkscape:connector-curvature="0" />
+  </g>
+  <path
+     inkscape:connector-curvature="0"
+     id="path8089-1-7-6"
+     d="M 61.387763,31.985985 A 29.387758,29.511157 0 0 1 31.999989,61.497141 29.387758,29.511157 0 0 1 2.6122369,31.985985 29.387758,29.511157 0 0 1 31.999989,2.4748264 29.387758,29.511157 0 0 1 61.387763,31.985985 Z"
+     style="opacity:0.4;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.01068568;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     inkscape:connector-curvature="0"
+     id="path8089-1-3-92-1"
+     d="M 60.408749,31.985985 A 28.408746,28.528035 0 0 1 31.999992,60.514019 28.408746,28.528035 0 0 1 3.5912509,31.985985 28.408746,28.528035 0 0 1 31.999992,3.4579477 28.408746,28.528035 0 0 1 60.408749,31.985985 Z"
+     style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.99692827;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <g
+     style="opacity:0.05;fill:#000000;fill-opacity:1"
+     id="g8243-2-7-4"
+     transform="matrix(0.14325492,0.14385644,-0.14325492,0.14385644,23.912004,-108.99186)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
+       id="rect8140-3-36-5" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
+       id="rect8172-9-2-12-2" />
+  </g>
+  <g
+     style="opacity:0.15;fill:#000000;fill-opacity:1"
+     id="g8243-2-7-5"
+     transform="matrix(0.13948439,0.1400701,-0.13948439,0.1400701,24.124884,-106.10501)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
+       id="rect8140-3-36-4" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
+       id="rect8172-9-2-12-7" />
+  </g>
+  <g
+     id="g4667"
+     transform="matrix(0.54449711,0,0,0.54449711,-6.6651445,-5.3006778)"
+     style="fill-opacity:1;fill:url(#linearGradient4202)">
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:url(#linearGradient4202);fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 97.330311,42.284792 a 7.0356347,7.1986844 39.729891 0 0 -3.278971,-1.929288 7.0356347,7.1986844 39.729891 0 0 -6.812034,1.857219 l -0.0015,-0.0015 -6.337307,6.363917 -2.41292,-2.423051 c -1.365731,-1.371466 -3.564848,-1.371466 -4.930579,0 -1.365732,1.371466 -1.365732,3.579818 0,4.951284 l 14.756822,14.818785 c 1.365732,1.371467 3.56485,1.371467 4.930581,0 1.365731,-1.371466 1.365731,-3.579816 0,-4.951282 l -2.41292,-2.423052 6.337307,-6.363916 -0.0034,-0.0034 a 7.0356347,7.1986844 39.729891 0 0 1.851392,-6.838692 7.0356347,7.1986844 39.729891 0 0 -1.686523,-3.057054 z"
+       id="rect8140-3-36" />
    <g
-       transform="matrix(1.0804281,0,0,1.0849648,-5.3620206,-87.639944)"
-       id="g6725">
-      <g
-         transform="matrix(0.33090784,0,0,0.33090784,-281.9594,838.59505)"
-         id="g4992">
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f2ec39;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 878.63707,891.61951 A 164.44035,164.44035 0 0 1 714.19672,1056.0599 164.44035,164.44035 0 0 1 549.75636,891.61951 164.44035,164.44035 0 0 1 714.19672,727.17915 164.44035,164.44035 0 0 1 878.63707,891.61951 Z"
-           id="path8272-96-8-29-8"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f9ba13;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 791.39679,746.42729 a 164.44035,164.44035 0 0 1 65.20945,62.97204 l -142.40952,82.22018 z"
-           id="path8272-5-7-5-1-4"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#f89a22;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 708.45783,727.27933 a 164.44035,164.44035 0 0 1 87.95907,21.93066 l -82.22018,142.40952 z"
-           id="path8272-5-6-6-4-2-5"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#ef5725;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 627.0566,752.16618 a 164.44035,164.44035 0 0 1 87.14012,-24.98703 l 0,164.44036 z"
-           id="path8272-5-6-9-29-5-7-0"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#ec3425;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 569.0045,814.41944 a 164.44035,164.44035 0 0 1 62.97204,-65.20946 l 82.22018,142.40953 z"
-           id="path8272-5-6-9-6-82-5-0-3"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#a61d4c;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 549.85654,897.35839 a 164.44035,164.44035 0 0 1 21.93065,-87.95906 l 142.40953,82.22018 z"
-           id="path8272-5-6-9-6-3-9-2-9-6"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#7d3693;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 574.74339,978.75962 A 164.44035,164.44035 0 0 1 549.75636,891.6195 l 164.44036,10e-6 z"
-           id="path8272-5-6-9-6-3-0-15-5-3-1"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#47318f;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 636.99665,1036.8117 A 164.44035,164.44035 0 0 1 571.78719,973.83968 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-6-7-6-0"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#3e5daa;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 719.93561,1055.9597 A 164.44035,164.44035 0 0 1 631.97654,1034.029 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-1-5-0-6"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#1892cd;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 801.33682,1031.0728 a 164.44035,164.44035 0 0 1 -87.1401,24.9871 l 0,-164.44039 z"
-           id="path8272-5-6-9-6-3-0-8-5-4-9-4-62-3"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#63ae45;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 859.38893,968.81958 A 164.44035,164.44035 0 0 1 796.41689,1034.029 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-4-4-9-8-61-2"
-           inkscape:connector-curvature="0" />
-        <path
-           transform="matrix(0.25881905,0.96592583,0.96592583,-0.25881905,0,0)"
-           style="fill:#cedd38;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="m 878.63707,891.61951 a 164.44035,164.44035 0 0 1 -22.03083,82.22017 L 714.19672,891.61951 Z"
-           id="path8272-5-6-9-6-3-0-8-5-4-4-3-69-0-8-0"
-           inkscape:connector-curvature="0" />
-        <path
-           style="opacity:0.4;fill:none;fill-opacity:1;stroke:#000000;stroke-width:5.62718296;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 1210.0349,459.59296 A 163.94891,163.94891 0 0 1 1046.0859,623.54187 163.94891,163.94891 0 0 1 882.13702,459.59296 163.94891,163.94891 0 0 1 1046.0859,295.64404 163.94891,163.94891 0 0 1 1210.0349,459.59296 Z"
-           id="path8089-1-7-6"
-           inkscape:connector-curvature="0" />
-        <path
-           style="opacity:0.5;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:3.02979922;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           d="M 1206.0136,459.09299 A 159.92764,159.92764 0 0 1 1046.0859,619.02063 159.92764,159.92764 0 0 1 886.15829,459.09299 159.92764,159.92764 0 0 1 1046.0859,299.16534 159.92764,159.92764 0 0 1 1206.0136,459.09299 Z"
-           id="path8089-1-3-92-1"
-           inkscape:connector-curvature="0" />
-      </g>
-      <g
-         transform="matrix(0.38831928,0,0,0.38831928,-342.01671,808.82989)"
-         id="g4871">
-        <g
-           transform="matrix(0.71065266,0.71065266,-0.71065266,0.71065266,1005.9634,-230.31972)"
-           id="g8243-2-7-4"
-           style="opacity:0.05;fill:#000000;fill-opacity:1">
-          <path
-             id="rect8140-3-36-5"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-          <path
-             id="rect8172-9-2-12-2"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="matrix(0.69194807,0.69194807,-0.69194807,0.69194807,1007.0195,-216.5247)"
-           id="g8243-2-7-5"
-           style="opacity:0.15;fill:#000000;fill-opacity:1">
-          <path
-             id="rect8140-3-36-4"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-          <path
-             id="rect8172-9-2-12-7"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-        </g>
-        <g
-           transform="matrix(0.67061887,0.67061887,-0.67061887,0.67061887,1008.2237,-200.28301)"
-           id="g8243-2-7"
-           style="fill:#ffffff">
-          <path
-             id="rect8140-3-36"
-             d="m 525.66016,363.19141 a 20,20.455589 0 0 0 -10.47266,2.73437 20,20.455589 0 0 0 -9.99414,17.44336 l -0.006,0 0,25.52539 -9.71875,0 c -5.50089,0 -9.92969,4.4288 -9.92969,9.92969 0,5.50089 4.4288,9.92969 9.92969,9.92969 l 59.4375,0 c 5.50089,0 9.92969,-4.4288 9.92969,-9.92969 0,-5.50089 -4.4288,-9.92969 -9.92969,-9.92969 l -9.71875,0 0,-25.52539 -0.0137,0 a 20,20.455589 0 0 0 -9.98633,-17.44336 20,20.455589 0 0 0 -9.52734,-2.73437 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-          <path
-             id="rect8172-9-2-12"
-             d="m 505.1875,438.1582 0,95.9375 0,0.0274 0.008,0 13.20703,41.51172 13.57227,0 13.20508,-41.51172 0.008,0 0,-0.0274 0,-95.9375 -40,0 z"
-             style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
+       transform="matrix(0.88241267,0,0,0.88241267,14.536297,13.778944)"
+       id="g4284"
+       style="fill-opacity:1;fill:url(#linearGradient4202)">
+      <path
+         id="rect8172-9-2-12"
+         d="m 66.974129,47.701228 -26.992865,27.106208 -0.0077,0.0077 0.0023,0.0023 -7.963775,15.460251 3.818679,3.834713 15.395056,-7.997766 0.0023,0.0023 0.0077,-0.0077 L 78.228591,59.002947 66.974236,47.701336 Z"
+         style="fill:url(#linearGradient4202);fill-opacity:1;stroke:none;stroke-width:0.34900001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
    </g>
  </g>
 </svg>
@@ -7,6 +7,11 @@ foreach i : icon_sizes
    )
 endforeach

+install_data(
+    meson.project_name() + '.gschema.xml',
+    install_dir: join_paths(get_option('datadir'), 'glib-2.0', 'schemas')
+)
+
 install_data(
    meson.project_name() + '.desktop',
    install_dir: join_paths(get_option('datadir'), 'applications')
@@ -1,13 +1,60 @@
+com.github.ronnydo.colorpicker (0.9.4) xenial; urgency=medium
+
+  * Fix issue #16
+  
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 26 Jun 2017 23:10:00 +0100
+
+com.github.ronnydo.colorpicker (0.9.3) xenial; urgency=medium
+
+  * Color Picker now restores your recent window position, color format and color history! (issue #10, issue #11 and issue #15)
+  * Minor icon changes
+  
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 26 Jun 2017 22:45:00 +0100
+
+com.github.ronnydo.colorpicker (0.9.2) xenial; urgency=medium
+
+  * Fix issue #9
+  
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 23 Jun 2017 17:15:00 +0100
+
+com.github.ronnydo.colorpicker (0.9.1) xenial; urgency=medium
+
+  * Fix issue #8
+  
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 23 Jun 2017 09:45:00 +0100
+
+com.github.ronnydo.colorpicker (0.9.0) xenial; urgency=medium
+
+  * Beta release
+  * Fix issue #4
+  * Fix issue #5
+  * Fix issue #6
+  * Fix issue #7
+  * Update icons
+  * Add German translation
+
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 22 Jun 2017 23:02:00 +0100
+
 com.github.ronnydo.colorpicker (0.1.2) xenial; urgency=low

  * Fix build information

- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 21 Jun 2017 08:53:39 +0100
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 21 Jun 2017 19:22:00 +0100
+ 
+com.github.ronnydo.colorpicker (0.1.1) xenial; urgency=low

  * Added debian files and logo files

- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 18 Jun 2017 08:53:39 +0100
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 19 Jun 2017 00:44:00 +0100
+  
+com.github.ronnydo.colorpicker (0.1.0) xenial; urgency=low

-  * First official release.
+  * First official release

- -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 15 Jun 2017 08:53:39 +0100
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 15 Jun 2017 13:21:00 +0100
+ 
+com.github.ronnydo.colorpicker (0.0.1) xenial; urgency=low
+
+  * Release Test
+
+ -- Ronny Dobra <ronnydobra at arcor dot de>  Thu, 15 Jun 2017 12:59:00 +0100
@@ -2,10 +2,10 @@ Source: com.github.ronnydo.colorpicker
 Section: x11
 Priority: extra
 Maintainer: Ronny Dobra <ronnydobra at arcor dot de>
-Build-Depends: cmake (>= 2.8),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
               libgranite-dev,
               libgtk-3-dev,
+               meson
               valac
               
 Standards-Version: 3.9.3
@@ -1,24 +0,0 @@
-Format: http://dep.debian.net/deps/dep5
-Upstream-Name: colorpicker
-Source: https://github.com/RonnyDo/ColorPicker
-
-Files: *
-Copyright: 2017 Ronny Dobra <https://github.com/RonnyDo/ColorPicker>
-License: GPL-3.0+
-
-License: GPL-3.0+
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
@@ -10,5 +10,20 @@
 #export DH_VERBOSE=1

 %:
-	dh $@ 
+	dh $@

+override_dh_auto_clean:
+	rm -rf debian/build
+
+override_dh_auto_configure:
+	mkdir -p debian/build
+	cd debian/build && meson --prefix=/usr ../..
+
+override_dh_auto_build:
+	cd debian/build && ninja -v
+
+override_dh_auto_test:
+	cd debian/build && ninja test
+
+override_dh_auto_install:
+	cd debian/build && DESTDIR=${CURDIR}/debian/com.github.ronnydo.colorpicker ninja install
@@ -1,15 +1,21 @@
 project('com.github.ronnydo.colorpicker', ['vala', 'c'],
-    version: '0.1.2'
+    version: '0.1.2',
+    license: 'GPL-3.0'
 )

 gnome = import('gnome')
-#i18n = import('i18n')
+i18n = import('i18n')

 conf = configuration_data()
 conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
 configure_file(output: 'config.h', configuration: conf)
 config_h_dir = include_directories('.')

+
+c_args = [
+  '-include', 'config.h'
+]
+
 executable(
    'com.github.ronnydo.colorpicker',
    'src/ColorPicker.vala',
@@ -18,14 +24,18 @@ executable(
    'src/Widgets/ColorArea.vala',
    'src/Widgets/ColorHistory.vala',
    'src/Widgets/MousePosition.vala',
+    'src/Services/Settings.vala',
+    c_args: c_args,
    dependencies: [
+        dependency('glib-2.0'),
+        dependency('gobject-2.0'),
        dependency('granite'),
        dependency('gtk+-3.0'),
    ],
    install : true
 )

-#meson.add_install_script('meson/post_install.py')
+meson.add_install_script('meson/post_install.py')

 subdir('data')
-#subdir('po')
+subdir('po')
@@ -0,0 +1,10 @@
+#!/usr/bin/env python3
+
+import os
+import subprocess
+
+schemadir = os.path.join(os.environ['MESON_INSTALL_PREFIX'], 'share', 'glib-2.0', 'schemas')
+
+if not os.environ.get('DESTDIR'):
+	print('Compiling gsettings schemas...')
+	subprocess.call(['glib-compile-schemas', schemadir])
@@ -0,0 +1 @@
+de
@@ -0,0 +1 @@
+src/ColorPickerWindow.vala
@@ -0,0 +1,33 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the com.github.danrabbit.nimbus package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+
+msgid ""
+msgstr ""
+"Project-Id-Version: com.github.ronnydo.colorpicker\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-21 20:40-0700\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+msgid "Color Picker"
+msgstr ""
+
+
+msgid "Pick Color"
+msgstr ""
+
+
+msgid "Format"
+msgstr ""
+
+msgid "Color History"
+msgstr ""
@@ -0,0 +1,32 @@
+# German translations for com.github.ronnydo.colorpicker package.
+# Copyright (C) 2017 THE com.github.ronnydo.colorpicker'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the com.github.ronnydo.colorpicker package.
+# Ronny Dobra <ronnydobra at arcor dot de>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: com.github.ronnydo.colorpicker\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-06-21 20:40-0700\n"
+"PO-Revision-Date: 2017-06-21 20:40-0700\n"
+"Last-Translator: Ronny Dobra <ronnydobra at arcor dot de>\n"
+"Language-Team: German\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Color Picker"
+msgstr "Color Picker"
+
+
+msgid "Pick Color"
+msgstr "Farbe auswählen"
+
+
+msgid "Format"
+msgstr "Format"
+
+msgid "Color History"
+msgstr "Farb-Historie"
@@ -0,0 +1 @@
+i18n.gettext(meson.project_name(), preset: 'glib')
@@ -11,7 +11,7 @@
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 * General Public License for more details.
 *
-* You should have received a copy of the GNU General Public
+* You should have received a copy of the GNU General Public 
 * License along with this program; if not, write to the
 * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 * Boston, MA 02110-1301 USA
@@ -20,9 +20,13 @@
 */

 namespace ColorPicker {
+
+    // namespace-wide variable
+    public ColorPicker.Services.Settings settings;
    
    public class ColorPickerApp : Granite.Application {
        
+        
        public ColorPickerApp () {
            Object (application_id: "com.github.ronnydo.colorpicker",
            flags: ApplicationFlags.FLAGS_NONE);
@@ -34,8 +38,10 @@ namespace ColorPicker {
                return;
            }
            
+            settings = ColorPicker.Services.Settings.get_instance ();
+            
            var app_window = new ColorPickerWindow (this);
-
+            
            app_window.show_all ();

            var quit_action = new SimpleAction ("quit", null);
@@ -22,24 +22,24 @@
 namespace ColorPicker {
    
    public class ColorPickerWindow: Gtk.Dialog {
-    
+            
        ExtRGBA ext_active_color = ExtRGBA ();
-        
+                
        public ColorPickerWindow (Gtk.Application application) {
            Object (application: application,
                icon_name: "com.github.ronnydo.colorpicker",
-                    title: "Color Picker",
+                    title: _("Color Picker"),
                    resizable: false,
                    //height_request: 500,
                    width_request: 500
-                    );  
+            );
        }        
        
        construct {
-            // main box      
+            // main box                       
            ext_active_color.parse ("#FFFFFF");
-                  
-            var color_area = new ColorArea ();
+            
+            var color_area = new ColorPicker.Widgets.ColorArea ();
            color_area.set_color (ext_active_color);
            
            var hex_label = new Gtk.Label (ext_active_color.to_uppercase_hex_string ());
@@ -48,10 +48,9 @@ namespace ColorPicker {
            hex_label.set_selectable (true);
            hex_label.set_use_markup (true);
            
-            hex_label.get_style_context ().add_class ("h1");
+            hex_label.get_style_context ().add_class ("h1");            
            
-            
-            var pick_color_button = new Gtk.Button.with_label ("Pick Color");
+            var pick_color_button = new Gtk.Button.with_label (_("Pick Color"));
            pick_color_button.get_style_context ().add_class (Gtk.STYLE_CLASS_SUGGESTED_ACTION);         
            pick_color_button.halign = Gtk.Align.END;
            pick_color_button.valign = Gtk.Align.BASELINE;
@@ -70,7 +69,7 @@ namespace ColorPicker {
            main_box.pack_start (main_right_box);
            
            // format box
-            var format_label = new Gtk.Label ("Format");
+            var format_label = new Gtk.Label (_("Format"));
            format_label.get_style_context ().add_class ("h4");
            format_label.halign = Gtk.Align.START;
            
@@ -87,7 +86,7 @@ namespace ColorPicker {
            color_format_combobox.append_text ("rgba");
            color_format_combobox.append_text ("Gdk RGBA");
            color_format_combobox.append_text ("Qt rgba");
-            color_format_combobox.active = 2;
+            color_format_combobox.active = settings.color_format_index;
            
            var adjust_button = new Gtk.Button.from_icon_name ("media-eq-symbolic");
            adjust_button.margin_start = 12;
@@ -104,11 +103,11 @@ namespace ColorPicker {
            // format_box.pack_start (adjust_button);
            
            // color history box
-            var color_history_label = new Gtk.Label ("Color History");
+            var color_history_label = new Gtk.Label (_("Color History"));
            color_history_label.get_style_context ().add_class ("h4");
            color_history_label.halign = Gtk.Align.START;
            
-            var color_history = new ColorHistory ();
+            var color_history = new ColorPicker.Widgets.ColorHistory ();
            
            var color_history_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);            
            color_history_box.margin_top = 6;
@@ -123,10 +122,35 @@ namespace ColorPicker {
            skeleton_box.margin_bottom = 0;        
            skeleton_box.pack_start (main_box);            
            skeleton_box.pack_start (format_box);
-                		
+            
    		var content_box = get_content_area () as Gtk.Box; 		
-    		content_box.pack_start (skeleton_box);
-    		    		        
+    		content_box.pack_start (skeleton_box);   
+    		    		
+    		
+            // restore old state
+    		var color_list = color_history.get_color_list ();
+    		if (color_list != null && color_list.size >= 1) {
+    		    ext_active_color = (ExtRGBA) color_list.last ();
+    		    
+    		    hex_label.set_markup (ext_active_color.to_uppercase_hex_string ());
+                color_area.set_color (ext_active_color);
+                color_area.queue_draw ();
+		        int id = color_format_combobox.get_active ();
+		        update_color_format_combobox_text (format_entry, id);
+		        
+		        if (color_list.size >= 2) {
+		            skeleton_box.pack_start (color_history_box);
+                    color_history_box.show_all ();
+		        }
+    		}
+    		
+            var window_x = settings.window_x;
+            var window_y = settings.window_y;
+            
+            if (window_x != -1 ||  window_y != -1) {
+              move (window_x, window_y);
+            }
+                		    		    		    		        
    		// activate color picker    
            pick_color_button.clicked.connect (() => {
                var mouse_position = new ColorPicker.Widgets.MousePosition ();
@@ -142,6 +166,7 @@ namespace ColorPicker {
                mouse_position.cancelled.connect (() => {
                    color_area.set_color (ext_active_color);
                    color_area.queue_draw ();
+                    hex_label.set_markup (ext_active_color.to_uppercase_hex_string ());
                    mouse_position.close ();
                    this.present ();
                });
@@ -158,10 +183,10 @@ namespace ColorPicker {
                    
                    color_history.add_color (ext_active_color);       
                                               
-                    var color_list = color_history.get_color_list ();
+                    var c_list = color_history.get_color_list ();
                    
                    if (color_history_box.get_parent () == null) {
-                        if (color_list != null && color_list.size > 1) {
+                        if (c_list != null && c_list.size >= 2) {
                            skeleton_box.pack_start (color_history_box);
                            color_history_box.show_all ();
                        }
@@ -180,10 +205,15 @@ namespace ColorPicker {
                }
            });
            
+            
+            //color_format_combobox.changed.connect (color_format_changed);
+            
            color_format_combobox.changed.connect (() => {
                int id = color_format_combobox.get_active ();                
     			update_color_format_combobox_text (format_entry, id);
+     			ColorPicker.settings.color_format_index = id;
     		});
+     		
            
            // handle changed color in color history
            color_history.color_clicked.connect ((t, color) => {
@@ -198,7 +228,8 @@ namespace ColorPicker {
                
                this.present ();                    
            });
-          
+                                  
+                		          
            // trigger picker on startup
            pick_color_button.clicked ();
        }
@@ -226,6 +257,17 @@ namespace ColorPicker {
           }
        }
        
+        public override bool delete_event (Gdk.EventAny event) {   
+            // save window position             
+            int root_x, root_y;
+            get_position (out root_x, out root_y);
+            
+            settings.window_x = root_x;
+            settings.window_y = root_y;
+            
+            return false;
+        }
+        
    }
    
    
@@ -0,0 +1,46 @@
+/*
+* Copyright (c) 2017 Ronny Dobra (https://github.com/RonnyDo/ColorPicker)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public
+* License as published by the Free Software Foundation; either
+* version 2 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*
+* Authored by: Ronny Dobra <ronnydobra at arcor dot de>
+*/
+
+namespace ColorPicker.Services {
+
+    public class Settings : Granite.Services.Settings {
+    
+        private static Settings? instance = null;
+
+        public int window_x { get; set; }
+        public int window_y { get; set; }
+        public int color_format_index { get; set; }
+        public string[] color_history { get; set; }
+
+        public static Settings get_instance () {
+            if (instance == null) {
+                instance = new Settings ();
+            }
+
+            return instance;
+        }
+
+        private Settings () {
+            base ("com.github.ronnydo.colorpicker");
+        }
+    }
+}
+
@@ -19,7 +19,7 @@
 * Authored by: Ronny Dobra <ronnydobra at arcor dot de>
 */

-namespace ColorPicker {
+namespace ColorPicker.Widgets {
    
    public class ColorArea: Gtk.DrawingArea {
        
@@ -18,7 +18,8 @@
 *
 * Authored by: Ronny Dobra <ronnydobra at arcor dot de>
 */
-namespace ColorPicker {
+
+namespace ColorPicker.Widgets {
    
    public class ColorHistory: Gtk.DrawingArea {
    
@@ -46,25 +47,60 @@ namespace ColorPicker {
            set_size_request (100, 28);
            add_events(Gdk.EventMask.BUTTON_PRESS_MASK | Gdk.EventMask.BUTTON_RELEASE_MASK | Gdk.EventMask.ENTER_NOTIFY_MASK);
            color_list = new Gee.ArrayList<Gdk.RGBA?> ();
+            restore_colors ();
            border_color.parse (border_color_string); 
-            triangle_color.parse (triangle_color_string);            
+            triangle_color.parse (triangle_color_string);
        }
        
        construct {            
-            //get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.HAND2));
-            get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.HAND2));
+            get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.HAND2));              
        }
        
+        private void restore_colors () {   
+            var color_array = settings.color_history;
+            
+            if (color_array != null) {            
+                // if more colors should be saved as allowed, drop the oldest ones.
+                if (max_colors < color_array.length) {
+                    int offset = color_array.length - max_colors;
+                    var sliced_array = color_array [offset:color_array.length];
+                    color_array = sliced_array;
+                }
+                
+                foreach (var color_value in color_array) {
+                    Gdk.RGBA color = Gdk.RGBA();
+                    color.parse(color_value);
+                    color_list.add (color);
+                }
+                
+                selected_color = color_list.size - 1;     
+            }
+        }
+        
+        private void store_colors () {
+            var c_list = get_color_list ();
+            string[] c_array = new string[c_list.size + 1];
+            
+            for (int i = 0; i < c_list.size; i++) {
+                c_array[i] = c_list.get (i).to_string ();
+            }
+                       
+            settings.color_history = c_array;
+        } 
+        
        public void add_color (Gdk.RGBA color) {
-            if (color_list.size == max_colors) {
+            if (color_list.size >= max_colors) {
                remove_oldest_color ();
            }
            color_list.add (color);
-            selected_color = get_color_list ().size - 1;     
+            store_colors ();
+            
+            selected_color = get_color_list ().size - 1;
        }
        
        public void remove_oldest_color () {
            color_list.remove_at (0);
+            store_colors ();
        }
        
        public Gee.ArrayList<Gdk.RGBA?> get_color_list () {
@@ -74,7 +110,6 @@ namespace ColorPicker {
              
        /* Widget is asked to draw itself */
        public override bool draw (Cairo.Context ctx) {
-                       
        
            int width = get_allocated_width (); // better element_width / amount
            int height = get_allocated_height ();
@@ -89,7 +124,7 @@ namespace ColorPicker {
                ctx.rel_line_to (-1 * width / color_list.size - 1, 0);
                ctx.close_path ();
                                
-                Gdk.cairo_set_source_rgba (ctx, color_list.get(i));
+                Gdk.cairo_set_source_rgba (ctx, color_list.get (i));
                
                ctx.fill ();
            }
@@ -184,8 +219,6 @@ namespace ColorPicker {
        
        
        public override bool button_release_event (Gdk.EventButton e) {   
-             
-            stdout.printf("clicked");
            if (e.button != 1) {
                return true;
            }
@@ -22,6 +22,7 @@
 namespace ColorPicker.Widgets {

    public class MousePosition : Granite.Widgets.CompositedWindow {
+    
        public signal void picked (Gdk.RGBA color);
        public signal void cancelled ();
        public signal void moved (Gdk.RGBA color);
Author	SHA1	Message	Date
Ronny Dobra	33765cdef1	add missing meson file (issue #16 )	2017-06-26 23:07:10 +02:00
Ronny Dobra	b3b9365bda	update README	2017-06-26 22:59:13 +02:00
Ronny Dobra	2fdfab926b	update screenshot	2017-06-26 22:52:15 +02:00
Ronny Dobra	28c9a74221	minor icon changes	2017-06-26 22:35:05 +02:00
Ronny Dobra	a9b2386cc4	implement issue #15 : Remember last color format; add settings-class	2017-06-26 22:18:58 +02:00
Ronny Dobra	657f7594f1	implement issue #11 : Remember color history between sessions	2017-06-25 20:15:03 +02:00
Ronny Dobra	4dd56a8c3c	add gSettings support; implement issue #10 : Remember window position	2017-06-25 14:40:52 +02:00
Ronny Dobra	89f04d677f	fix typo	2017-06-25 01:11:54 +02:00
Ronny Dobra	e83daa8424	update project description; fix issue #14	2017-06-25 01:08:40 +02:00
Ronny Dobra	82b4f4215f	fix issue #9	2017-06-23 17:10:42 +02:00
Ronny Dobra	caffa54137	fix issue #8 : debbuild with meson	2017-06-23 08:44:30 +02:00
Ronny Dobra	7285b7948d	fixing some alignment issues	2017-06-22 23:20:40 +02:00
Ronny Dobra	bb7cc7a74e	add ';'	2017-06-22 23:00:12 +02:00
Ronny Dobra	e8abe3a11c	update screenshot with elementaryos default window decoration	2017-06-22 22:57:58 +02:00
Ronny Dobra	6171c69994	fix .desktop file references generic icon; add Graphics category to .desktop	2017-06-22 21:04:07 +02:00
Ronny Dobra	c9b7c336b3	update debian changelog	2017-06-22 20:54:32 +02:00
Ronny Dobra	5767e51595	udpate README	2017-06-21 22:28:18 +02:00
Ronny Dobra	81a3056fb6	udpate README	2017-06-21 22:25:56 +02:00
Ronny Dobra	06f9fe606a	update project description and translation	2017-06-21 22:14:50 +02:00
Ronny Dobra	4d4ffe5bbb	add translations	2017-06-21 21:48:15 +02:00
				`@@ -0,0 +1 @@`
				`i18n.gettext(meson.project_name(), preset: 'glib')`