Merge branch '17-new-icon' into 'master'

Add new icon

Closes #17

See merge request bustle/bustle!19

13 files changed, 295 insertions, 396 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 40db59e..8290d94 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,29 +1,6 @@
 stages:
-  - lint
   - build
 
-variables:
-  ZENHASKELL_IMAGE: "zenhaskell/gtk:lts-12.20"
-
-lint:
-  stage: lint
-  image: ${ZENHASKELL_IMAGE}
-  script:
-  - hlint .
-
-stack-build-test:
-  stage: build
-  image: ${ZENHASKELL_IMAGE}
-  before_script:
-    - apt install -y libpcap-dev
-  script:
-    - stack build
-    - stack test
-  cache:
-    key: "stack-work"
-    paths:
-      - .stack-work
-
 flatpak-build:
   stage: build
   image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:3.28
diff --git a/Bustle/UI/AboutDialog.hs b/Bustle/UI/AboutDialog.hs
index a7080e7..95f4491 100644
--- a/Bustle/UI/AboutDialog.hs
+++ b/Bustle/UI/AboutDialog.hs
@@ -48,6 +48,7 @@ showAboutDialog window = do
                  , aboutDialogComments := __ "Someone's favourite D-Bus profiler"
                  , aboutDialogWebsite := "https://gitlab.freedesktop.org/bustle/bustle#readme"
                  , aboutDialogAuthors := authors
+                 , aboutDialogArtists := artists
                  , aboutDialogCopyright := "© 2008–2017 Will Thompson, Collabora Ltd. and contributors"
                  , aboutDialogLicense := license
                  , aboutDialogLogoIconName := Just "org.freedesktop.Bustle"
@@ -71,3 +72,7 @@ authors = [ "Will Thompson <will@willthompson.co.uk>"
           , "Jonny Lamb"
           , "Daniel Firth"
           ]
+
+artists :: [String]
+artists = [ "Tobias Bernard"
+          ]
diff --git a/Makefile b/Makefile
index c5ea363..7a6370a 100644
--- a/Makefile
+++ b/Makefile
@@ -16,16 +16,13 @@ BINARIES = \
 MANPAGE = bustle-pcap.1
 DESKTOP_FILE = org.freedesktop.Bustle.desktop
 APPDATA_FILE = org.freedesktop.Bustle.appdata.xml
-ICON_SIZES = 16x16 22x22 32x32 48x48 256x256
 SCALABLE_ICONS = \
 	data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg \
+	data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.Devel.svg \
 	data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg \
 	$(NULL)
-ICONS = \
-	$(SCALABLE_ICONS) \
-	$(foreach size,$(ICON_SIZES),data/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png) \
 
-all: $(BINARIES) $(MANPAGE) $(DESKTOP_FILE) $(APPDATA_FILE) $(ICONS)
+all: $(BINARIES) $(MANPAGE) $(DESKTOP_FILE) $(APPDATA_FILE) $(SCALABLE_ICONS)
 
 BUSTLE_PCAP_SOURCES = c-sources/pcap-monitor.c c-sources/bustle-pcap.c
 BUSTLE_PCAP_GENERATED_HEADERS = dist/build/autogen/version.h
@@ -71,8 +68,6 @@ install: all
 	cp $(DESKTOP_FILE) $(DATADIR)/applications
 	mkdir -p $(DATADIR)/appdata
 	cp $(APPDATA_FILE) $(DATADIR)/appdata
-	$(foreach size,$(ICON_SIZES),mkdir -p $(DATADIR)/icons/hicolor/$(size)/apps; )
-	$(foreach size,$(ICON_SIZES),cp data/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png $(DATADIR)/icons/hicolor/$(size)/apps; )
 	mkdir -p $(DATADIR)/icons/hicolor/scalable/apps
 	cp $(SCALABLE_ICONS) $(DATADIR)/icons/hicolor/scalable/apps
 	$(MAKE) update-icon-cache
@@ -82,7 +77,8 @@ uninstall:
 	rm -f $(MAN1DIR)/$(MANPAGE)
 	rm -f $(DATADIR)/applications/$(DESKTOP_FILE)
 	rm -f $(DATADIR)/appdata/$(APPDATA_FILE)
-	$(foreach size,$(ICON_SIZES),rm -f $(DATADIR)/icons/hicolor/$(size)/apps/org.freedesktop.Bustle.png)
+	rm -f $(DATADIR)/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg
+	rm -f $(DATADIR)/icons/hicolor/scalable/apps/org.freedesktop.Bustle.Devel.svg
 	rm -f $(DATADIR)/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg
 	$(MAKE) update-icon-cache
 
diff --git a/bustle.cabal b/bustle.cabal
index d15ab61..3220392 100644
--- a/bustle.cabal
+++ b/bustle.cabal
@@ -44,12 +44,8 @@ Extra-source-files:
                   , data/org.freedesktop.Bustle.desktop.in
 
                   -- icons
-                  , data/icons/hicolor/16x16/apps/org.freedesktop.Bustle.png
-                  , data/icons/hicolor/22x22/apps/org.freedesktop.Bustle.png
-                  , data/icons/hicolor/32x32/apps/org.freedesktop.Bustle.png
-                  , data/icons/hicolor/48x48/apps/org.freedesktop.Bustle.png
-                  , data/icons/hicolor/256x256/apps/org.freedesktop.Bustle.png
                   , data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg
+                  , data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.Devel.svg
                   , data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg
 
 x-gettext-po-files:     po/*.po
diff --git a/data/icons/hicolor/16x16/apps/org.freedesktop.Bustle.png b/data/icons/hicolor/16x16/apps/org.freedesktop.Bustle.png
deleted file mode 100644
index a043a68..0000000
--- a/data/icons/hicolor/16x16/apps/org.freedesktop.Bustle.png
+++ /dev/null
diff --git a/data/icons/hicolor/22x22/apps/org.freedesktop.Bustle.png b/data/icons/hicolor/22x22/apps/org.freedesktop.Bustle.png
deleted file mode 100644
index c9aab82..0000000
--- a/data/icons/hicolor/22x22/apps/org.freedesktop.Bustle.png
+++ /dev/null
diff --git a/data/icons/hicolor/256x256/apps/org.freedesktop.Bustle.png b/data/icons/hicolor/256x256/apps/org.freedesktop.Bustle.png
deleted file mode 100644
index 669635c..0000000
--- a/data/icons/hicolor/256x256/apps/org.freedesktop.Bustle.png
+++ /dev/null
diff --git a/data/icons/hicolor/32x32/apps/org.freedesktop.Bustle.png b/data/icons/hicolor/32x32/apps/org.freedesktop.Bustle.png
deleted file mode 100644
index 70610b7..0000000
--- a/data/icons/hicolor/32x32/apps/org.freedesktop.Bustle.png
+++ /dev/null
diff --git a/data/icons/hicolor/48x48/apps/org.freedesktop.Bustle.png b/data/icons/hicolor/48x48/apps/org.freedesktop.Bustle.png
deleted file mode 100644
index 25ae4a5..0000000
--- a/data/icons/hicolor/48x48/apps/org.freedesktop.Bustle.png
+++ /dev/null
diff --git a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg
index ae183f2..aa986cf 100644
--- a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg
+++ b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle-symbolic.svg
@@ -1,109 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="256"
-   height="256"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="org.freedesktop.Bustle-symbolic.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.6796875"
-     inkscape:cx="128"
-     inkscape:cy="93.172193"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="3200"
-     inkscape:window-height="1671"
-     inkscape:window-x="0"
-     inkscape:window-y="55"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showguides="true"
-     inkscape:guide-bbox="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3834"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-228.94108"
-       originy="-779.84559"
-       spacingx="1"
-       spacingy="1" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-228.94108,-16.516576)">
-    <g
-       id="g1404"
-       transform="matrix(0.42666667,0,0,0.42666667,204.64622,21.983358)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path4626"
-         d="m 349.58008,-12.728516 c -19.78034,0.499891 -39.51808,2.890348 -58.82031,7.2539096 4.10872,18.8723954 8.21745,37.7447914 12.32617,56.6171874 33.74925,-7.665785 69.12626,-7.971229 103.02539,-1.0293 3.71633,-18.821141 8.65912,-38.435398 11.61328,-56.7636714 -22.39128,-4.5980686 -45.29405,-6.6135646 -68.14453,-6.0781256 z m 105.80078,78.716797 c 31.47813,14.008295 59.87299,34.867319 82.70703,60.664059 14.44727,-12.81901 28.89453,-25.63802 43.3418,-38.457028 C 553.05494,56.141376 517.74279,30.253699 478.60547,12.900391 470.86393,30.596354 463.1224,48.292318 455.38086,65.988281 Z M 227.18164,16.626953 C 189.51961,34.723972 155.71119,60.77538 128.625,92.591797 c 14.7487,12.470703 29.49739,24.941413 44.24609,37.412113 22.37137,-26.20404 50.37565,-47.593699 81.60157,-62.169926 -8.17123,-17.501302 -16.34245,-35.002604 -24.51368,-52.503906 -0.92578,0.432292 -1.85156,0.864583 -2.77734,1.296875 z M 568.0293,168.66016 c 16.99699,30.09909 27.33124,63.91871 30.12695,98.36914 19.23893,-1.70833 38.47787,-3.41667 57.7168,-5.125 -3.5014,-42.55686 -16.29754,-84.32012 -37.26568,-121.51953 -16.85936,9.42513 -33.71871,18.85026 -50.57807,28.27539 z M 89.939453,150.27539 c -18.701268,36.38678 -29.811885,76.6502 -32.357428,117.48438 19.276042,1.22135 38.552083,2.44271 57.828125,3.66406 2.15345,-34.4883 11.88032,-68.47463 28.29492,-98.88281 -17.08268,-9.01302 -34.16536,-18.02605 -51.248045,-27.03907 -0.839191,1.59115 -1.678381,3.18229 -2.517572,4.77344 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#dedede;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:57.94400024;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:5.19999981;stroke-dasharray:115.88800049, 57.94400024;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      <circle
-         transform="matrix(0.50880116,0,0,0.55776489,164.13818,45.848517)"
-         cy="433.79074"
-         cx="381.42856"
-         id="path2985-7"
-         style="fill:none;stroke:#bebebe;stroke-width:75.08624268;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         r="0" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path3757-7"
-         transform="translate(56.941089,-12.819102)"
-         d="m 430,220 30,55 h -85 v 50 h 85 l -30,55 170,-80 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:60;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         inkscape:connector-curvature="0"
-         id="path3761-7"
-         transform="translate(56.941089,-12.819102)"
-         d="M 170,220 0,300 170,380 140,325 h 85 v -50 h -85 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:60;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path4619"
-         d="m 356.94141,187.18164 c -55.02475,0 -100.00001,44.97526 -100,100 -1e-5,55.02475 44.97525,100 100,100 55.02475,0 100,-44.97525 100,-100 0,-55.02475 -44.97525,-100 -100,-100 z m 0,34.39844 c 36.43357,0 65.59961,29.168 65.59961,65.60156 0,36.43356 -29.16604,65.59961 -65.59961,65.59961 -36.43357,0 -65.59961,-29.16605 -65.59961,-65.59961 0,-36.43356 29.16604,-65.60156 65.59961,-65.60156 z"
-         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:34.40008163;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:5.19999981;stroke-dasharray:none;stroke-dashoffset:94.40000153;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
-    </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16px" height="16px" viewBox="0 0 16 16" version="1.1">
+<g id="surface92">
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 7 12.5 C 7 13.328125 6.328125 14 5.5 14 C 4.671875 14 4 13.328125 4 12.5 C 4 11.671875 4.671875 11 5.5 11 C 6.328125 11 7 11.671875 7 12.5 Z M 7 12.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 12 12.5 C 12 13.328125 11.328125 14 10.5 14 C 9.671875 14 9 13.328125 9 12.5 C 9 11.671875 9.671875 11 10.5 11 C 11.328125 11 12 11.671875 12 12.5 Z M 12 12.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 1 7 L 1 9 L 16 9 L 16 7 Z M 1 7 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 8 3 L 8 8 L 9 8 L 9 3 Z M 8 3 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 3 3 L 3 8 L 4 8 L 4 3 Z M 3 3 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 13 3 L 13 8 L 14 8 L 14 3 Z M 13 3 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 5 3.5 C 5 4.328125 4.328125 5 3.5 5 C 2.671875 5 2 4.328125 2 3.5 C 2 2.671875 2.671875 2 3.5 2 C 4.328125 2 5 2.671875 5 3.5 Z M 5 3.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 10 3.5 C 10 4.328125 9.328125 5 8.5 5 C 7.671875 5 7 4.328125 7 3.5 C 7 2.671875 7.671875 2 8.5 2 C 9.328125 2 10 2.671875 10 3.5 Z M 10 3.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 15 3.5 C 15 4.328125 14.328125 5 13.5 5 C 12.671875 5 12 4.328125 12 3.5 C 12 2.671875 12.671875 2 13.5 2 C 14.328125 2 15 2.671875 15 3.5 Z M 15 3.5 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 10 8 L 10 13 L 11 13 L 11 8 Z M 10 8 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(14.117648%,12.156863%,19.215687%);fill-opacity:1;" d="M 5 8 L 5 13 L 6 13 L 6 8 Z M 5 8 "/>
+</g>
 </svg>
diff --git a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.Devel.svg b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.Devel.svg
new file mode 100644
index 0000000..dc19c04
--- /dev/null
+++ b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.Devel.svg
@@ -0,0 +1,191 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,32,-16)">
+<stop offset="0" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(20%,81.960785%,47.843137%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,72,-16)">
+<stop offset="0" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(20.784314%,51.764709%,89.411765%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,-8,-16)">
+<stop offset="0" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(100%,47.058824%,0%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" >
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,40,0)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear5" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,80,0)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear6" gradientUnits="userSpaceOnUse" x1="56" y1="232" x2="56" y2="240" >
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear7" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,20,18)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear8" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,60,18)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear9" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,12,54)">
+<stop offset="0" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(96.470588%,82.745099%,17.647059%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear10" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,52,54)">
+<stop offset="0" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(87.843138%,10.588235%,14.117648%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear11" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,32,-16)">
+<stop offset="0" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(20%,81.960785%,47.843137%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear12" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,72,-16)">
+<stop offset="0" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(20.784314%,51.764709%,89.411765%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear13" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,-8,-16)">
+<stop offset="0" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(100%,47.058824%,0%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear14" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" >
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear15" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,40,0)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear16" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,80,0)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear17" gradientUnits="userSpaceOnUse" x1="56" y1="232" x2="56" y2="240" >
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear18" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,20,18)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear19" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,60,18)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear20" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,12,54)">
+<stop offset="0" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(96.470588%,82.745099%,17.647059%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear21" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,52,54)">
+<stop offset="0" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(87.843138%,10.588235%,14.117648%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>
+</linearGradient>
+<clipPath id="clip2">
+  <rect x="0" y="0" width="128" height="128"/>
+</clipPath>
+<g id="surface78" clip-path="url(#clip2)">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear11);" d="M 64 18 C 58.285156 18 53.003906 21.050781 50.144531 26 L 48 26 L 48 34 C 48 42.835938 55.164062 50 64 50 C 72.835938 50 80 42.835938 80 34 L 80 26 L 77.855469 26 C 74.996094 21.050781 69.714844 18 64 18 Z M 64 18 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.117648%,89.019608%,53.725493%);fill-opacity:1;" d="M 80 26 C 80 34.835938 72.835938 42 64 42 C 55.164062 42 48 34.835938 48 26 C 48 17.164062 55.164062 10 64 10 C 72.835938 10 80 17.164062 80 26 Z M 80 26 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear12);" d="M 104 18 C 98.285156 18 93.003906 21.050781 90.144531 26 L 88 26 L 88 34 C 88 42.835938 95.164062 50 104 50 C 112.835938 50 120 42.835938 120 34 L 120 26 L 117.855469 26 C 114.996094 21.050781 109.714844 18 104 18 Z M 104 18 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.431373%,62.7451%,91.764706%);fill-opacity:1;" d="M 120 26 C 120 34.835938 112.835938 42 104 42 C 95.164062 42 88 34.835938 88 26 C 88 17.164062 95.164062 10 104 10 C 112.835938 10 120 17.164062 120 26 Z M 120 26 "/>
+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear13);" d="M 24 18 C 18.285156 18 13.003906 21.050781 10.144531 26 L 8 26 L 8 34 C 8 42.835938 15.164062 50 24 50 C 32.835938 50 40 42.835938 40 34 L 40 26 L 37.855469 26 C 34.996094 21.050781 29.714844 18 24 18 Z M 24 18 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,47.058824%,0%);fill-opacity:1;" d="M 40 26 C 40 34.835938 32.835938 42 24 42 C 15.164062 42 8 34.835938 8 26 C 8 17.164062 15.164062 10 24 10 C 32.835938 10 40 17.164062 40 26 Z M 40 26 "/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear14);stroke-miterlimit:4;" d="M 24 235 L 24 220 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear15);stroke-miterlimit:4;" d="M 64 235 L 64 220 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear16);stroke-miterlimit:4;" d="M 104 235 L 104 220 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear17);stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear18);stroke-miterlimit:4;" d="M 44 253 L 44 239 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear19);stroke-miterlimit:4;" d="M 84 253 L 84 239 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear20);" d="M 44 88 C 38.285156 88 33.003906 91.050781 30.144531 96 L 28 96 L 28 104 C 28 112.835938 35.164062 120 44 120 C 52.835938 120 60 112.835938 60 104 L 60 96 L 57.855469 96 C 54.996094 91.050781 49.714844 88 44 88 Z M 44 88 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(97.254902%,89.411765%,36.078432%);fill-opacity:1;" d="M 60 96 C 60 104.835938 52.835938 112 44 112 C 35.164062 112 28 104.835938 28 96 C 28 87.164062 35.164062 80 44 80 C 52.835938 80 60 87.164062 60 96 Z M 60 96 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear21);" d="M 84 88 C 78.285156 88 73.003906 91.050781 70.144531 96 L 68 96 L 68 104 C 68 112.835938 75.164062 120 84 120 C 92.835938 120 100 112.835938 100 104 L 100 96 L 97.855469 96 C 94.996094 91.050781 89.714844 88 84 88 Z M 84 88 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(92.941177%,20%,23.137255%);fill-opacity:1;" d="M 100 96 C 100 104.835938 92.835938 112 84 112 C 75.164062 112 68 104.835938 68 96 C 68 87.164062 75.164062 80 84 80 C 92.835938 80 100 87.164062 100 96 Z M 100 96 "/>
+</g>
+<clipPath id="clip1">
+  <rect x="0" y="0" width="128" height="128"/>
+</clipPath>
+<filter id="alpha" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%">
+  <feColorMatrix type="matrix" in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
+</filter>
+<g id="surface81" clip-path="url(#clip1)" filter="url(#alpha)">
+<use xlink:href="#surface78"/>
+</g>
+<mask id="mask0">
+<use xlink:href="#surface81"/>
+</mask>
+<mask id="mask1">
+  <g filter="url(#alpha)">
+<rect x="0" y="0" width="128" height="128" style="fill:rgb(0%,0%,0%);fill-opacity:0.8;stroke:none;"/>
+  </g>
+</mask>
+<linearGradient id="linear22" gradientUnits="userSpaceOnUse" x1="300" y1="235" x2="428" y2="235" gradientTransform="matrix(0.000000000000000023,0.37,-0.98462,0.00000000000000006,295.38501,-30.360001)">
+<stop offset="0" style="stop-color:rgb(97.647059%,94.117647%,41.960785%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(96.078432%,76.078433%,6.666667%);stop-opacity:1;"/>
+</linearGradient>
+<clipPath id="clip4">
+  <rect x="0" y="0" width="128" height="128"/>
+</clipPath>
+<g id="surface75" clip-path="url(#clip4)">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear22);" d="M 128 80.640625 L 128 128 L 0 128 L 0 80.640625 Z M 128 80.640625 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,0%,0%);fill-opacity:1;" d="M 13.308594 80.640625 L 60.664062 128 L 81.878906 128 L 34.519531 80.640625 Z M 55.730469 80.640625 L 103.09375 128 L 124.308594 128 L 76.945312 80.640625 Z M 98.160156 80.640625 L 128 110.480469 L 128 89.269531 L 119.371094 80.640625 Z M 0 88.546875 L 0 109.761719 L 18.238281 128 L 39.453125 128 Z M 0 88.546875 "/>
+</g>
+<clipPath id="clip3">
+  <rect x="0" y="0" width="128" height="128"/>
+</clipPath>
+<g id="surface80" clip-path="url(#clip3)">
+<use xlink:href="#surface75" mask="url(#mask1)"/>
+</g>
+</defs>
+<g id="surface68">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 64 18 C 58.285156 18 53.003906 21.050781 50.144531 26 L 48 26 L 48 34 C 48 42.835938 55.164062 50 64 50 C 72.835938 50 80 42.835938 80 34 L 80 26 L 77.855469 26 C 74.996094 21.050781 69.714844 18 64 18 Z M 64 18 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.117648%,89.019608%,53.725493%);fill-opacity:1;" d="M 80 26 C 80 34.835938 72.835938 42 64 42 C 55.164062 42 48 34.835938 48 26 C 48 17.164062 55.164062 10 64 10 C 72.835938 10 80 17.164062 80 26 Z M 80 26 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 104 18 C 98.285156 18 93.003906 21.050781 90.144531 26 L 88 26 L 88 34 C 88 42.835938 95.164062 50 104 50 C 112.835938 50 120 42.835938 120 34 L 120 26 L 117.855469 26 C 114.996094 21.050781 109.714844 18 104 18 Z M 104 18 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.431373%,62.7451%,91.764706%);fill-opacity:1;" d="M 120 26 C 120 34.835938 112.835938 42 104 42 C 95.164062 42 88 34.835938 88 26 C 88 17.164062 95.164062 10 104 10 C 112.835938 10 120 17.164062 120 26 Z M 120 26 "/>
+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 24 18 C 18.285156 18 13.003906 21.050781 10.144531 26 L 8 26 L 8 34 C 8 42.835938 15.164062 50 24 50 C 32.835938 50 40 42.835938 40 34 L 40 26 L 37.855469 26 C 34.996094 21.050781 29.714844 18 24 18 Z M 24 18 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,47.058824%,0%);fill-opacity:1;" d="M 40 26 C 40 34.835938 32.835938 42 24 42 C 15.164062 42 8 34.835938 8 26 C 8 17.164062 15.164062 10 24 10 C 32.835938 10 40 17.164062 40 26 Z M 40 26 "/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear3);stroke-miterlimit:4;" d="M 24 235 L 24 220 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear4);stroke-miterlimit:4;" d="M 64 235 L 64 220 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear5);stroke-miterlimit:4;" d="M 104 235 L 104 220 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear6);stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear7);stroke-miterlimit:4;" d="M 44 253 L 44 239 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear8);stroke-miterlimit:4;" d="M 84 253 L 84 239 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear9);" d="M 44 88 C 38.285156 88 33.003906 91.050781 30.144531 96 L 28 96 L 28 104 C 28 112.835938 35.164062 120 44 120 C 52.835938 120 60 112.835938 60 104 L 60 96 L 57.855469 96 C 54.996094 91.050781 49.714844 88 44 88 Z M 44 88 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(97.254902%,89.411765%,36.078432%);fill-opacity:1;" d="M 60 96 C 60 104.835938 52.835938 112 44 112 C 35.164062 112 28 104.835938 28 96 C 28 87.164062 35.164062 80 44 80 C 52.835938 80 60 87.164062 60 96 Z M 60 96 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear10);" d="M 84 88 C 78.285156 88 73.003906 91.050781 70.144531 96 L 68 96 L 68 104 C 68 112.835938 75.164062 120 84 120 C 92.835938 120 100 112.835938 100 104 L 100 96 L 97.855469 96 C 94.996094 91.050781 89.714844 88 84 88 Z M 84 88 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(92.941177%,20%,23.137255%);fill-opacity:1;" d="M 100 96 C 100 104.835938 92.835938 112 84 112 C 75.164062 112 68 104.835938 68 96 C 68 87.164062 75.164062 80 84 80 C 92.835938 80 100 87.164062 100 96 Z M 100 96 "/>
+<use xlink:href="#surface80" mask="url(#mask0)"/>
+</g>
+</svg>
diff --git a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg
index 9c96ef6..a210412 100644
--- a/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg
+++ b/data/icons/hicolor/scalable/apps/org.freedesktop.Bustle.svg
@@ -1,252 +1,79 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="256"
-   height="256"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.4 5da689c313, 2019-01-14"
-   sodipodi:docname="org.freedesktop.Bustle.svg">
-  <defs
-     id="defs4">
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4126"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4123"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4120"
-       effect="spiro" />
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4117"
-       effect="spiro" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3763"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3759"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-3"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3759-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3763-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-6"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-3-1"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-6-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3763-2-7"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3770-3-1-2"
-       is_visible="true" />
-    <inkscape:path-effect
-       effect="spiro"
-       id="path-effect3759-7-2"
-       is_visible="true" />
-    <filter
-       id="filter4104"
-       inkscape:label="Chalk and sponge"
-       inkscape:menu="Distort"
-       inkscape:menu-tooltip="Low turbulence gives sponge look and high turbulence chalk"
-       width="1.6"
-       height="2"
-       y="-0.5"
-       x="-0.30000001"
-       style="color-interpolation-filters:sRGB">
-      <feTurbulence
-         id="feTurbulence4106"
-         baseFrequency="0.4"
-         type="fractalNoise"
-         seed="0"
-         numOctaves="5"
-         result="result1" />
-      <feOffset
-         id="feOffset4108"
-         dx="-5"
-         dy="-5"
-         result="result2" />
-      <feDisplacementMap
-         id="feDisplacementMap4110"
-         in2="result1"
-         xChannelSelector="R"
-         yChannelSelector="G"
-         scale="30"
-         in="SourceGraphic" />
-    </filter>
-    <filter
-       id="filter4183"
-       inkscape:label="Chalk and sponge"
-       inkscape:menu="Distort"
-       inkscape:menu-tooltip="Low turbulence gives sponge look and high turbulence chalk"
-       width="1.6"
-       height="2"
-       y="-0.5"
-       x="-0.30000001"
-       style="color-interpolation-filters:sRGB">
-      <feTurbulence
-         id="feTurbulence4185"
-         baseFrequency="0.4"
-         type="fractalNoise"
-         seed="0"
-         numOctaves="5"
-         result="result1" />
-      <feOffset
-         id="feOffset4187"
-         dx="-5"
-         dy="-5"
-         result="result2" />
-      <feDisplacementMap
-         id="feDisplacementMap4189"
-         in2="result1"
-         xChannelSelector="R"
-         yChannelSelector="G"
-         scale="30"
-         in="SourceGraphic" />
-    </filter>
-    <inkscape:path-effect
-       is_visible="true"
-       id="path-effect4117-2"
-       effect="spiro" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="9.2695312"
-     inkscape:cx="128"
-     inkscape:cy="71.987112"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="3200"
-     inkscape:window-height="1671"
-     inkscape:window-x="0"
-     inkscape:window-y="55"
-     inkscape:window-maximized="1"
-     fit-margin-top="1"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3834"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       originx="-232.64974"
-       originy="-799.15823"
-       spacingx="1"
-       spacingy="1" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-232.64974,2.7960645)">
-    <g
-       id="g1412"
-       transform="matrix(0.41816393,0,0,0.41816393,209.83903,7.3082603)">
-      <path
-         inkscape:connector-curvature="0"
-         id="path3802-8"
-         d="m 70.761814,288.36996 c -0.01207,-1.2669 -0.02449,-2.53589 -0.02449,-3.80671 0,-159.41492 129.271656,-288.6461129 288.736206,-288.6461129 159.46457,0 288.73621,129.2311929 288.73621,288.6461129 v 0 0 c 0,1.27082 -0.009,2.53969 -0.0245,3.80671"
-         style="fill:none;stroke:#74b674;stroke-width:27.59247017;stroke-miterlimit:4;stroke-dasharray:82.77741051, 27.59247017;stroke-dashoffset:27.59247017;stroke-opacity:1" />
-      <ellipse
-         transform="matrix(0.50880116,0,0,0.55776489,164.13818,45.848517)"
-         id="path2985-7"
-         style="fill:none;stroke:#000000;stroke-width:34.42315674;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         cx="381.42856"
-         cy="433.79074"
-         rx="130"
-         ry="118.57143" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="M 417.41556,287.80173 H 628.85727"
-         inkscape:path-effect="#path-effect3759-7"
-         id="path3757-7"
-         d="M 417.41556,287.80173 H 628.85727"
-         style="fill:none;stroke:#000000;stroke-width:18.45480156;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         inkscape:connector-curvature="0"
-         inkscape:original-d="m 294.08479,287.66116 -211.718251,0.2812"
-         inkscape:path-effect="#path-effect3763-2"
-         id="path3761-7"
-         d="m 294.08479,287.66116 -211.718251,0.2812"
-         style="fill:none;stroke:#000000;stroke-width:18.17925262;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="M 200.97285,226.67532 77.897224,289.6408 200.97285,348.92819"
-         inkscape:path-effect="#path-effect3770-6"
-         id="path3768-2"
-         d="M 200.97285,226.67532 77.897224,289.6408 200.97285,348.92819"
-         style="fill:none;stroke:#000000;stroke-width:18.33793068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccc"
-         inkscape:connector-curvature="0"
-         inkscape:original-d="M 520.66838,225.39683 643.74401,288.36232 520.66838,347.6497"
-         inkscape:path-effect="#path-effect3770-3-1"
-         id="path3768-9-7"
-         d="M 520.66838,225.39683 643.74401,288.36232 520.66838,347.6497"
-         style="fill:none;stroke:#000000;stroke-width:18.33793068;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="128px" height="128px" viewBox="0 0 128 128" version="1.1">
+<defs>
+<linearGradient id="linear0" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,32,-16)">
+<stop offset="0" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(20%,81.960785%,47.843137%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(14.901961%,63.529414%,41.176471%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear1" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,72,-16)">
+<stop offset="0" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(20.784314%,51.764709%,89.411765%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(10.196079%,37.254903%,70.588237%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear2" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,-8,-16)">
+<stop offset="0" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(100%,47.058824%,0%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(77.64706%,27.450982%,0%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear3" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" >
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear4" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,40,0)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear5" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,80,0)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear6" gradientUnits="userSpaceOnUse" x1="56" y1="232" x2="56" y2="240" >
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear7" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,20,18)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear8" gradientUnits="userSpaceOnUse" x1="20" y1="227.5" x2="28" y2="227.5" gradientTransform="matrix(1,0,0,1,60,18)">
+<stop offset="0" style="stop-color:rgb(75.294119%,74.901962%,73.725492%);stop-opacity:1;"/>
+<stop offset="0.3" style="stop-color:rgb(87.058824%,86.666667%,85.490197%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(46.666667%,46.27451%,48.235294%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear9" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,12,54)">
+<stop offset="0" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(96.470588%,82.745099%,17.647059%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(89.803922%,64.705884%,3.921569%);stop-opacity:1;"/>
+</linearGradient>
+<linearGradient id="linear10" gradientUnits="userSpaceOnUse" x1="16" y1="50" x2="48" y2="50" gradientTransform="matrix(1,0,0,1,52,54)">
+<stop offset="0" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>
+<stop offset="0.5" style="stop-color:rgb(87.843138%,10.588235%,14.117648%);stop-opacity:1;"/>
+<stop offset="1" style="stop-color:rgb(64.705884%,11.372549%,17.647059%);stop-opacity:1;"/>
+</linearGradient>
+</defs>
+<g id="surface62">
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear0);" d="M 64 18 C 58.285156 18 53.003906 21.050781 50.144531 26 L 48 26 L 48 34 C 48 42.835938 55.164062 50 64 50 C 72.835938 50 80 42.835938 80 34 L 80 26 L 77.855469 26 C 74.996094 21.050781 69.714844 18 64 18 Z M 64 18 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(34.117648%,89.019608%,53.725493%);fill-opacity:1;" d="M 80 26 C 80 34.835938 72.835938 42 64 42 C 55.164062 42 48 34.835938 48 26 C 48 17.164062 55.164062 10 64 10 C 72.835938 10 80 17.164062 80 26 Z M 80 26 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear1);" d="M 104 18 C 98.285156 18 93.003906 21.050781 90.144531 26 L 88 26 L 88 34 C 88 42.835938 95.164062 50 104 50 C 112.835938 50 120 42.835938 120 34 L 120 26 L 117.855469 26 C 114.996094 21.050781 109.714844 18 104 18 Z M 104 18 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(38.431373%,62.7451%,91.764706%);fill-opacity:1;" d="M 120 26 C 120 34.835938 112.835938 42 104 42 C 95.164062 42 88 34.835938 88 26 C 88 17.164062 95.164062 10 104 10 C 112.835938 10 120 17.164062 120 26 Z M 120 26 "/>
+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:rgb(0%,0%,0%);stroke-opacity:1;stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear2);" d="M 24 18 C 18.285156 18 13.003906 21.050781 10.144531 26 L 8 26 L 8 34 C 8 42.835938 15.164062 50 24 50 C 32.835938 50 40 42.835938 40 34 L 40 26 L 37.855469 26 C 34.996094 21.050781 29.714844 18 24 18 Z M 24 18 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,47.058824%,0%);fill-opacity:1;" d="M 40 26 C 40 34.835938 32.835938 42 24 42 C 15.164062 42 8 34.835938 8 26 C 8 17.164062 15.164062 10 24 10 C 32.835938 10 40 17.164062 40 26 Z M 40 26 "/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear3);stroke-miterlimit:4;" d="M 24 235 L 24 220 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear4);stroke-miterlimit:4;" d="M 64 235 L 64 220 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear5);stroke-miterlimit:4;" d="M 104 235 L 104 220 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke:url(#linear6);stroke-miterlimit:4;" d="M 8 236 L 120 236 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear7);stroke-miterlimit:4;" d="M 44 253 L 44 239 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style="fill:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:miter;stroke:url(#linear8);stroke-miterlimit:4;" d="M 84 253 L 84 239 " transform="matrix(1,0,0,1,0,-172)"/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear9);" d="M 44 88 C 38.285156 88 33.003906 91.050781 30.144531 96 L 28 96 L 28 104 C 28 112.835938 35.164062 120 44 120 C 52.835938 120 60 112.835938 60 104 L 60 96 L 57.855469 96 C 54.996094 91.050781 49.714844 88 44 88 Z M 44 88 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(97.254902%,89.411765%,36.078432%);fill-opacity:1;" d="M 60 96 C 60 104.835938 52.835938 112 44 112 C 35.164062 112 28 104.835938 28 96 C 28 87.164062 35.164062 80 44 80 C 52.835938 80 60 87.164062 60 96 Z M 60 96 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:url(#linear10);" d="M 84 88 C 78.285156 88 73.003906 91.050781 70.144531 96 L 68 96 L 68 104 C 68 112.835938 75.164062 120 84 120 C 92.835938 120 100 112.835938 100 104 L 100 96 L 97.855469 96 C 94.996094 91.050781 89.714844 88 84 88 Z M 84 88 "/>
+<path style=" stroke:none;fill-rule:nonzero;fill:rgb(92.941177%,20%,23.137255%);fill-opacity:1;" d="M 100 96 C 100 104.835938 92.835938 112 84 112 C 75.164062 112 68 104.835938 68 96 C 68 87.164062 75.164062 80 84 80 C 92.835938 80 100 87.164062 100 96 Z M 100 96 "/>
+</g>
 </svg>
diff --git a/stack.yaml b/stack.yaml
index 61d2231..619d5e5 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,4 +1,4 @@
-resolver: lts-14.22
+resolver: lts-15.12
 packages:
 - .
 flags: