93 files changed, 731 insertions, 6111 deletions
diff --git a/contrib/.gitignore b/contrib/.gitignore
index 01b6efa05..af16caeef 100644
--- a/contrib/.gitignore
+++ b/contrib/.gitignore
@@ -1,3 +1,4 @@
+sphinx
 gnunet_janitor.py
 gnunet_pyexpect.py
 pydiffer.py
diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index f25751513..b7507d224 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -1,39 +1,10 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
-SUBDIRS = scripts hellos services
+SUBDIRS = scripts services
 include Makefile.inc
-dist_pkgdata_DATA = \
-  gns/def.tex \
-  gns/gns-bcd.html \
-  gns/gns-bcd.tex \
-  gns/gns-bcd-forbidden.html \
-  gns/gns-bcd-internal-error.html \
-  gns/gns-bcd-invalid-key.html \
-  gns/gns-bcd-not-found.html \
-  gns/gns-bcd-png.tex \
-  gns/gns-bcd-simple.html \
-  gns/gns-bcd-simple.tex \
-  fcfsd/fcfsd-index.html \
-  fcfsd/fcfsd-forbidden.html \
-  fcfsd/fcfsd-notfound.html \
-  branding/logo/gnunet-logo.png \
-  branding/logo/lynXified-amirouche-v3.svg \
-  branding/logo/gnunet-logo-dark-text.svg \
-  branding/logo/gnunet-logo-color.png \
-  branding/logo/lynXified-amirouche-anonymous-v3.png \
-  branding/logo/gnunet-logo-dark-only-text.svg \
-  branding/logo/gnunet-logo-big.png \
-  branding/logo/gnunet-logo.pdf \
-  testing_hostkeys.ecc \
-  netjail/netjail_core.sh \
-  netjail/netjail_exec.sh \
-  netjail/netjail_start.sh \
-  netjail/netjail_stop.sh \
-  netjail/topo.sh
 INITD_FILES = \
  services/systemd/gnunet-user.service \
  services/systemd/sysusers-gnunet.conf \
@@ -42,6 +13,10 @@ INITD_FILES = \
  services/openrc/gnunet.initd
 PACKAGES_FILES = \
+        packages/fedora/10-dns2gns.sh \
+        packages/fedora/gnunet-system.conf \
+        packages/fedora/gnunet.service \
+        packages/fedora/gnunet-user.service \
  packages/alpine/gnunet-gtk/APKBUILD \
  packages/alpine/gnurl/APKBUILD \
  packages/alpine/gnunet/gnunet-user-services.initd \
@@ -168,7 +143,6 @@ EXTRA_DIST = \
  apparmor/gnunet-namestore-gtk \
  apparmor/gnunet-service-testbed-logger \
  apparmor/gnunet-peerstore \
-  apparmor/gnunet-namestore-fcfsd \
  apparmor/gnunet-core \
  apparmor/gnunet-gns-import.sh \
  apparmor/gnunet-gns-proxy \
@@ -209,22 +183,16 @@ EXTRA_DIST = \
  conf/nss/nssswitch.conf \
  testbed_configs/testbed_cluster.conf \
  testbed_configs/testbed_supermuc.conf \
-  guix.README \
+  packages/guix/guix.README \
  web/log.php \
-  ci/docker/docker-entrypoint.sh \
-  ci/docker/Dockerfile \
  ci/buildbot/buildbot-update.sh \
  ci/buildbot/ssh-keys \
  ci/buildbot/ssh-config \
  docker/docker-entrypoint.sh \
  docker/Dockerfile \
  docker/README.md \
-  docker/gnunet.conf \
  benchmark/collect.awk \
-  get_version.sh \
+  packages/guix/guix.scm \
-  gnunet_infrastructure/handbook_pull.sh \
-  guix.scm \
-  indent_pre-commit \
  Makefile.inc \
  vagrant/Vagrantfile \
  vagrant/bootstrap.ubuntu.sh \
@@ -266,11 +234,4 @@ xdgdeentrydir = $(datadir)/applications
 dist_xdgdeentry_DATA = \
  xdg-scheme-handler/gnunet-uri.desktop
-install-data-hook:
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_stop.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_exec.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/topo.sh'
 ## EOF
diff --git a/contrib/Makefile.inc b/contrib/Makefile.inc
index a563ef4a1..c737a07f8 100644
--- a/contrib/Makefile.inc
+++ b/contrib/Makefile.inc
@@ -8,8 +8,7 @@ BUILDCOMMON_SHLIB_FILES = \
    build-common/sh/lib.sh/existence_python.sh \
    build-common/sh/lib.sh/msg.sh \
    build-common/sh/lib.sh/progname.sh \
-    build-common/sh/lib.sh/version_gnunet.sh \
+    build-common/sh/lib.sh/version_gnunet.sh
-    build-common/LICENSE
 BUILDCOMMON_CONF_FILES = \
    build-common/conf/.dir-locals.el \
diff --git a/contrib/apparmor/gnunet-namestore-fcfsd b/contrib/apparmor/gnunet-namestore-fcfsd
deleted file mode 100644
index 8ac09e69b..000000000
--- a/contrib/apparmor/gnunet-namestore-fcfsd
+++ /dev/null
@@ -1,13 +0,0 @@
-# Last Modified: Tue Jul 21 17:25:12 2015
-#include <tunables/global>
-#include <tunables/gnunet>
-profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-namestore-fcfsd {
-  #include <abstractions/base>
-  #include <abstractions/gnunet-common>
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-namestore-fcfsd mr,
-  
-  # Site-specific additions and overrides. See local/README for details.
-  #include <local/gnunet>
-}
diff --git a/contrib/apparmor/gnunet-service-arm b/contrib/apparmor/gnunet-service-arm
index 546e6332e..2ad8d6140 100644
--- a/contrib/apparmor/gnunet-service-arm
+++ b/contrib/apparmor/gnunet-service-arm
@@ -32,8 +32,6 @@ profile @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-arm {
  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-gns-proxy Px,
-  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-namestore-fcfsd Px,
  #GNUnet service
  @{GNUNET_PREFIX}/lib/gnunet/libexec/gnunet-service-* Px,
  
diff --git a/contrib/branding/logo/gnunet-logo-big.png b/contrib/branding/logo/gnunet-logo-big.png
deleted file mode 100644
index 54c418f8f..000000000
--- a/contrib/branding/logo/gnunet-logo-big.png
+++ /dev/null
Binary files differ
diff --git a/contrib/branding/logo/gnunet-logo-color.png b/contrib/branding/logo/gnunet-logo-color.png
deleted file mode 100644
index 326822ebd..000000000
--- a/contrib/branding/logo/gnunet-logo-color.png
+++ /dev/null
Binary files differ
diff --git a/contrib/branding/logo/gnunet-logo-dark-only-text.svg b/contrib/branding/logo/gnunet-logo-dark-only-text.svg
deleted file mode 100644
index f4ca0f9d2..000000000
--- a/contrib/branding/logo/gnunet-logo-dark-only-text.svg
+++ /dev/null
@@ -1,1144 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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: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="svg2"
-   height="42.057301"
-   width="159.35417"
-   sodipodi:docname="gnunet-logo-dark-only-text.svg"
-   inkscape:version="0.92.3 (2405546, 2018-03-11)">
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1130"
-     inkscape:window-height="760"
-     id="namedview5639"
-     showgrid="false"
-     inkscape:zoom="3.2071429"
-     inkscape:cx="-2.4948441"
-     inkscape:cy="7.4954053"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <title
-     id="title3310">logo for GNUnet</title>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="gnunet">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:0.58431375;"
-         offset="0"
-         id="stop9516" />
-      <stop
-         style="stop-color:#ffcc00;stop-opacity:1;"
-         offset="1"
-         id="stop9518" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4094">
-      <stop
-         style="stop-color:#232323;stop-opacity:1;"
-         offset="0"
-         id="stop4096" />
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:1;"
-         offset="1"
-         id="stop4098" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4014">
-      <stop
-         style="stop-color:#a0a0a0;stop-opacity:1;"
-         offset="0"
-         id="stop4016" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4018" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4678">
-      <stop
-         style="stop-color:#e5e5e5;stop-opacity:1;"
-         offset="0"
-         id="stop4680" />
-      <stop
-         style="stop-color:#d3cdcd;stop-opacity:1;"
-         offset="1"
-         id="stop4682" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4341">
-      <stop
-         id="stop4343"
-         offset="0"
-         style="stop-color:#333333;stop-opacity:1;" />
-      <stop
-         id="stop4345"
-         offset="1"
-         style="stop-color:#484848;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4696-5">
-      <stop
-         id="stop4698-6"
-         offset="0"
-         style="stop-color:#ffb638;stop-opacity:1;" />
-      <stop
-         id="stop4700-2"
-         offset="1"
-         style="stop-color:#f0ae26;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4702-3-6">
-      <stop
-         id="stop4704-1"
-         offset="0"
-         style="stop-color:#ff0000;stop-opacity:0.58431375;" />
-      <stop
-         id="stop4706-8"
-         offset="1"
-         style="stop-color:#ffcc00;stop-opacity:1;" />
-    </linearGradient>
-    <color-profile
-       name="Artifex-PS-CMYK-Profile"
-       xlink:href="/usr/share/color/icc/ghostscript/ps_cmyk.icc"
-       id="color-profile5435" />
-    <linearGradient
-       y2="69.791016"
-       x2="177.04297"
-       y1="63.65625"
-       x1="142.96875"
-       gradientTransform="matrix(-0.88803314,0,0,0.88803314,595.57001,1106.9291)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3138"
-       xlink:href="#linearGradient4702-3-6" />
-    <linearGradient
-       y2="1043.709"
-       x2="80.655251"
-       y1="1025.709"
-       x1="108.08774"
-       gradientTransform="matrix(-0.49726789,0,0,0.49726789,555.31016,722.70088)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3141"
-       xlink:href="#linearGradient4696-5" />
-    <linearGradient
-       y2="922.07178"
-       x2="78.000107"
-       y1="1004.8033"
-       x1="113.5146"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.18739,350.00262)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3144"
-       xlink:href="#linearGradient4702-3-6" />
-    <linearGradient
-       y2="70.667412"
-       x2="176.60477"
-       y1="63.65625"
-       x1="142.96875"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.2161,1106.9294)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3148"
-       xlink:href="#linearGradient4702-3-6" />
-    <linearGradient
-       y2="70.667412"
-       x2="176.60477"
-       y1="63.65625"
-       x1="142.96875"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.2161,1106.9294)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3780"
-       xlink:href="#linearGradient4702-3-6" />
-    <linearGradient
-       y2="922.07178"
-       x2="78.000107"
-       y1="1004.8033"
-       x1="113.5146"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.18739,350.00262)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3782"
-       xlink:href="#linearGradient4702-3-6" />
-    <linearGradient
-       y2="1043.709"
-       x2="80.655251"
-       y1="1025.709"
-       x1="108.08774"
-       gradientTransform="matrix(-0.49726789,0,0,0.49726789,555.31016,722.70088)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3784"
-       xlink:href="#linearGradient4696-5" />
-    <linearGradient
-       y2="69.791016"
-       x2="177.04297"
-       y1="63.65625"
-       x1="142.96875"
-       gradientTransform="matrix(-0.88803314,0,0,0.88803314,595.57001,1106.9291)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3786"
-       xlink:href="#linearGradient4702-3-6" />
-    <filter
-       id="filter9204"
-       style="color-interpolation-filters:sRGB">
-      <feColorMatrix
-         id="feColorMatrix9194"
-         result="colormatrix"
-         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 -0.2125 -0.7154 -0.0721 1 0 "
-         in="SourceGraphic" />
-      <feComposite
-         k1="0"
-         id="feComposite9196"
-         result="composite"
-         k4="0"
-         k3="0"
-         k2="1"
-         operator="arithmetic"
-         in2="colormatrix"
-         in="SourceGraphic" />
-      <feGaussianBlur
-         id="feGaussianBlur9198"
-         result="blur1"
-         stdDeviation="5 0.01" />
-      <feGaussianBlur
-         id="feGaussianBlur9200"
-         result="blur2"
-         stdDeviation="0.01 5"
-         in="composite" />
-      <feBlend
-         id="feBlend9202"
-         result="blend"
-         mode="darken"
-         in2="blur1"
-         in="blur2" />
-    </filter>
-    <filter
-       id="filter9330"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur9328"
-         result="blur"
-         stdDeviation="2 2" />
-    </filter>
-  </defs>
-  <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>logo for GNUnet</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Luis Felipe López Acevedo, Amirouche Boubekki, carlo von lynX</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>GNUnet e.V.</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-        <dc:description />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="g5346"
-     style="display:none"
-     transform="translate(-467.72664,-836.92541)">
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="453.95291"
-       y="869.96057"
-       id="text5344"><tspan
-         id="tspan5342"
-         x="453.95291"
-         y="869.96057"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.33333206px;font-family:'Ubuntu Bold';-inkscape-font-specification:'Ubuntu Bold, ';fill:#ffffff;stroke-width:1.03365779px"
-         dx="0 0 0">gnu net</tspan></text>
-  </g>
-  <g
-     transform="translate(-467.72664,-836.92541)"
-     style="display:none"
-     id="g950">
-    <text
-       id="text948"
-       y="869.21057"
-       x="467.77612"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         dx="0 -2.5 -3 0 -19.25 -2.5 -3"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#ffffff;stroke-width:1.03365779px"
-         y="869.21057"
-         x="467.77612"
-         id="tspan946">gnu net</tspan></text>
-  </g>
-  <g
-     id="g941"
-     style="display:none"
-     transform="translate(-80.31201,-247.1061)">
-    <ellipse
-       ry="17.690269"
-       rx="17.68549"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#ee0000;stroke-width:1.68696308;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse937"
-       cx="157.97346"
-       cy="180.65355" />
-    <ellipse
-       ry="17.690269"
-       rx="17.68549"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#ee0000;stroke-width:1.68696308;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse939"
-       cx="157.97346"
-       cy="111.16864" />
-  </g>
-  <g
-     transform="translate(-467.72664,-836.92541)"
-     style="display:none"
-     id="g935">
-    <g
-       aria-label="gnu net"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;image-rendering:auto"
-       id="g933">
-      <path
-         d="m 423.90503,684.79003 h 22.14128 v 61.61056 q 0,11.55196 4.3855,16.04443 4.38546,4.49242 12.72857,4.49242 12.19374,0 20.00203,-9.94753 7.80828,-9.94753 7.80828,-27.48942 v -44.71046 h 22.14128 v 99.6893 h -22.14128 v -24.92231 q -3.31586,12.83553 -12.30071,20.10899 -8.98489,7.27346 -22.14132,7.27346 -15.29567,0 -23.95963,-9.94753 -8.664,-10.0545 -8.664,-30.59135 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#ffffff;stroke-width:4.46906853px"
-         id="path925"
-         inkscape:connector-curvature="0" />
-      <path
-         d="m 669.48029,784.47933 h -22.14128 v -61.50359 q 0,-11.65892 -4.3855,-16.15139 -4.38546,-4.49243 -12.72857,-4.49243 -12.30071,0 -20.10899,9.94753 -7.70132,9.94754 -7.70132,27.48947 v 44.71041 h -22.14128 v -99.6893 h 22.14128 v 25.02928 q 3.31586,-12.94249 12.30071,-20.10899 8.98489,-7.27346 22.14132,-7.27346 15.29567,0 23.95967,9.94753 8.66396,9.94753 8.66396,30.59135 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#ffffff;stroke-width:4.46906853px"
-         id="path927"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-  <g
-     id="g1296"
-     style="display:none"
-     transform="translate(-80.31201,-294.38421)">
-    <path
-       style="fill:none;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 62.698223,85.778107 -39.5,48.000003 v 0 l -1,2"
-       id="path1256"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#dddddd;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 12.698223,104.77811 10,29 21,-10.5 v 0 0"
-       id="path1258"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 11.809253,105.24526 63.6227,34.91188 23.31802,-11.09978 -35.03955,28.74946 11.86161,-17.77468 -53.18435,-5.79678 40.95076,23.69646 25.32406,0.49689 24.193047,3.02495 v 48.02104 l 21.04995,-32.14943 -20.559,-15.87161 32.52749,48.02104 -8.06937,31.38386 -24.94907,-31.76198 24.94907,77.51429 22.25436,-36.69889 21.97354,37.07701 -43.59987,-0.37188 41.32877,-28.87448 22.05899,-21.17152 -19.90986,50.171 -3.71591,-29.60613 -8.57843,-31.7682 -9.69437,24.71516 54.37611,-52.19866 -24.96716,8.94671 -18.39175,19.15282 18.27579,-55.07718 25.20812,27.362 20.66591,-41.35238 -46.00204,14.12783 22.94304,-37.07431 23.05297,23.0777 31.8814,-26.48075 40.07874,-25.58708 -15.26372,39.20869 -24.69305,-13.74039 -55.05634,4.03119 79.62738,9.58108 -56.57441,12.73416"
-       id="path1260"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 98.868943,129.31358 37.045597,48.02106"
-       id="path1262"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 88.284483,158.4287 10.96248,-29.11512 12.474537,32.51819"
-       id="path1264"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 212.13974,133.78236 54.69043,-3.64603 -31.75647,27.04795"
-       id="path1266"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#dddddd;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 399.11285,648.31931 50.5,-19.5 -14.05,28.1 0.925,-1.725 -5.875,11.75 -0.25,-0.75"
-       id="path1268"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:#729fcf;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 601.57854,741.42859 -2.26809,-64.28015"
-       id="path1270"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 189.57322,206.52811 -44,2.625 25.375,17.125 v 0"
-       id="path1272"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 475.69911,700.21367 24.57107,51.42411"
-       id="path1274"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 534.29164,751.63778 12.85257,40.08057"
-       id="path1276"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 525.21925,783.02162 0.37803,45.75234"
-       id="path1278"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 601.95657,742.56293 -12.09653,36.6775"
-       id="path1280"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 475.69911,700.59178 46.98395,22.0278 10.85256,28.26194"
-       id="path1282"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 589.104,778.86231 -12.85255,-66.17074 v 36.6775 z"
-       id="path1284"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 557.35064,768.27501 31.75336,10.5873"
-       id="path1286"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 500.27018,704.37298 v 48.77728 l 24.57105,30.2495 23.81505,9.45293"
-       id="path1288"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 524.46323,829.53019 44.98392,-0.37812"
-       id="path1290"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;stroke:#dddddd;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 694.61285,647.31931 -40.285,-17.00922 -4.715,-1.99078 29,57.5 v -0.5 0 h 0.5 v 0"
-       id="path1292"
-       inkscape:connector-curvature="0" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 409.92428,677.14844 54.05634,6.0499"
-       id="path1294"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     transform="translate(-80.31201,-294.38421)"
-     style="display:none"
-     id="g1254">
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="829.24042"
-       cx="568.98083"
-       id="ellipse1194"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1196"
-       cx="588.85413"
-       cy="778.67493" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="740.67249"
-       cx="601.57867"
-       id="ellipse1198"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1200"
-       cx="525.79852"
-       cy="829.24042" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1202"
-       cx="557.82654"
-       cy="768.71582" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="783.02173"
-       cx="525.21936"
-       id="ellipse1204"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1206"
-       cx="400.09586"
-       cy="647.34271" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1208"
-       cx="450.11285"
-       cy="628.31934" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1210"
-       cx="622.36951"
-       cy="699.45752" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1212"
-       cx="547.21771"
-       cy="792.29773" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1214"
-       cx="566.20697"
-       cy="800.12549" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="751.63794"
-       cx="500.64822"
-       id="ellipse1216"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1218"
-       cx="533.33447"
-       cy="751.72632" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1220"
-       cx="450.75012"
-       cy="699.83545" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="700.59174"
-       cx="476.07718"
-       id="ellipse1222"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1224"
-       cx="521.49146"
-       cy="719.65314" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1226"
-       cx="500.6362"
-       cy="703.87305" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="134.28851"
-       cx="211.9584"
-       id="ellipse1228"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1230"
-       cx="576.62964"
-       cy="713.44794" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="123.16669"
-       cx="43.166531"
-       id="ellipse1232"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1234"
-       cx="98.865997"
-       cy="129.43542" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="130.05022"
-       cx="267.08618"
-       id="ellipse1236"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1238"
-       cx="679.07196"
-       cy="686.22339" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="748.99109"
-       cx="577.00763"
-       id="ellipse1240"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1242"
-       cx="577.00763"
-       cy="748.99109" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="748.99109"
-       cx="577.07013"
-       id="ellipse1244"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(0,-3e-6)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="133.85095"
-       cx="22.887779"
-       id="ellipse1246"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="682.1922"
-       cx="462.47165"
-       id="ellipse1248"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="647.3053"
-       cx="694.58264"
-       id="ellipse1250"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1252"
-       cx="649.61285"
-       cy="628.31934" />
-  </g>
-  <g
-     id="g1539"
-     style="display:inline"
-     transform="translate(-80.31201,-247.1061)">
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3399cc;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1535"
-       cx="159.80099"
-       cy="276.32968" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3399cc;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1537"
-       cx="159.80099"
-       cy="259.99252" />
-  </g>
-  <g
-     transform="translate(-80.31201,-294.38421)"
-     style="display:none"
-     id="layer3">
-    <path
-       id="path5313"
-       d="m 62.698223,85.778107 -39.5,48.000003 v 0 l -1,2"
-       style="fill:none;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path5311"
-       d="m 12.698223,104.77811 10,29 21,-10.5 v 0 0"
-       style="fill:none;stroke:#cc0000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path9316"
-       d="m 11.809253,105.24526 63.6227,34.91188 23.31802,-11.09978 -35.03955,28.74946 11.86161,-17.77468 -53.18435,-5.79678 40.95076,23.69646 25.32406,0.49689 24.193047,3.02495 v 48.02104 l 21.04995,-32.14943 -20.559,-15.87161 32.52749,48.02104 -8.06937,31.38386 -24.94907,-31.76198 24.94907,77.51429 22.25436,-36.69889 21.97354,37.07701 -43.59987,-0.37188 41.32877,-28.87448 22.05899,-21.17152 -19.90986,50.171 -3.71591,-29.60613 -8.57843,-31.7682 -9.69437,24.71516 54.37611,-52.19866 -24.96716,8.94671 -18.39175,19.15282 18.27579,-55.07718 25.20812,27.362 20.66591,-41.35238 -46.00204,14.12783 22.94304,-37.07431 23.05297,23.0777 31.8814,-26.48075 40.07874,-25.58708 -15.26372,39.20869 -24.69305,-13.74039 -55.05634,4.03119 79.62738,9.58108 -56.57441,12.73416"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path9318"
-       d="m 98.868943,129.31358 37.045597,48.02106"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path12058"
-       d="m 88.284483,158.4287 10.96248,-29.11512 12.474537,32.51819"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path12250"
-       d="m 212.13974,133.78236 54.69043,-3.64603 -31.75647,27.04795"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path5161"
-       d="m 399.11285,648.31931 50.5,-19.5 -14.05,28.1 0.925,-1.725 -5.875,11.75 -0.25,-0.75"
-       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path12206"
-       d="m 601.57854,741.42859 -2.26809,-64.28015"
-       style="display:inline;opacity:1;fill:#729fcf;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path5331"
-       d="m 189.57322,206.52811 -44,2.625 25.375,17.125 v 0"
-       style="fill:none;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path9320"
-       d="m 475.69911,700.21367 24.57107,51.42411"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path9322"
-       d="m 534.29164,751.63778 12.85257,40.08057"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path9324"
-       d="m 525.21925,783.02162 0.37803,45.75234"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path9326"
-       d="m 601.95657,742.56293 -12.09653,36.6775"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path12060"
-       d="m 475.69911,700.59178 46.98395,22.0278 10.85256,28.26194"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path12208"
-       d="m 589.104,778.86231 -12.85255,-66.17074 v 36.6775 z"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path12210"
-       d="m 557.35064,768.27501 31.75336,10.5873"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path12212"
-       d="m 500.27018,704.37298 v 48.77728 l 24.57105,30.2495 23.81505,9.45293"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path12216"
-       d="m 524.46323,829.53019 44.98392,-0.37812"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path5163"
-       d="m 694.61285,647.31931 -40.285,-17.00922 -4.715,-1.99078 29,57.5 v -0.5 0 h 0.5 v 0"
-       style="display:inline;opacity:1;fill:none;stroke:#cc0000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-    <path
-       id="path12214"
-       d="m 409.92428,677.14844 54.05634,6.0499"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     id="g325"
-     style="display:none"
-     transform="translate(-80.31201,-294.38421)">
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12254"
-       cx="568.98083"
-       cy="829.24042"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="778.67493"
-       cx="588.85413"
-       id="ellipse12290"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12284"
-       cx="601.57867"
-       cy="740.67249"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="829.24042"
-       cx="525.79852"
-       id="ellipse12256"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="768.71582"
-       cx="557.82654"
-       id="ellipse12306"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12280"
-       cx="525.21936"
-       cy="783.02173"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="647.34271"
-       cx="400.09586"
-       id="ellipse12258"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="628.31934"
-       cx="450.11285"
-       id="ellipse12258-3"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="699.45752"
-       cx="622.36951"
-       id="ellipse12294"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="792.29773"
-       cx="547.21771"
-       id="ellipse12252"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="800.12549"
-       cx="566.20697"
-       id="ellipse12282"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12276"
-       cx="500.64822"
-       cy="751.63794"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="751.72632"
-       cx="533.33447"
-       id="ellipse12278"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="699.83545"
-       cx="450.75012"
-       id="ellipse12262"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12268"
-       cx="476.07718"
-       cy="700.59174"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="719.65314"
-       cx="521.49146"
-       id="ellipse12270"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="703.87305"
-       cx="500.6362"
-       id="ellipse12274"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12292"
-       cx="211.9584"
-       cy="134.28851"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="713.44794"
-       cx="576.62964"
-       id="ellipse12286"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12260"
-       cx="43.166531"
-       cy="123.16669"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="129.43542"
-       cx="98.865997"
-       id="ellipse12266"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12296"
-       cx="267.08618"
-       cy="130.05022"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="686.22339"
-       cx="679.07196"
-       id="ellipse12298"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12288"
-       cx="577.00763"
-       cy="748.99109"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="748.99109"
-       cx="577.00763"
-       id="ellipse12302"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12304"
-       cx="577.07013"
-       cy="748.99109"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12264"
-       cx="22.887779"
-       cy="133.85095"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(0,-3e-6)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12272"
-       cx="462.47165"
-       cy="682.1922"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12300"
-       cx="694.58264"
-       cy="647.3053"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="628.31934"
-       cx="649.61285"
-       id="ellipse12258-3-0"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-  </g>
-  <g
-     transform="translate(-80.31201,-247.1061)"
-     style="display:none"
-     id="layer6">
-    <ellipse
-       cy="276.32968"
-       cx="159.80099"
-       id="ellipse12282-8-9-0"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#ee0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="259.99252"
-       cx="159.80099"
-       id="ellipse12282-8-9"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#ee0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       rx="4.1581793"
-       ry="4.1593032" />
-  </g>
-  <g
-     id="g975"
-     style="display:inline"
-     transform="translate(-467.72664,-836.92541)">
-    <g
-       id="text973"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;image-rendering:auto"
-       aria-label="gnu net">
-      <path
-         id="path977"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;fill-opacity:1;stroke-width:1.03365779px"
-         d="m 489.62118,868.96318 q 0,2.375 -0.81641,4.23046 -0.81641,1.85547 -2.30078,3.14193 -1.45964,1.28646 -3.46354,1.95443 -1.97917,0.69271 -4.42839,0.69271 -6.01172,0 -10.26693,-3.63672 l 2.42448,-3.95834 q 3.53776,3.04297 7.84245,3.04297 2.64714,0 4.25521,-1.31119 1.63281,-1.28646 1.63281,-4.0573 v -2.47395 q -1.58333,1.36067 -3.04297,2.02864 -1.45963,0.64323 -3.38932,0.64323 -2.22656,0 -4.13151,-0.9401 -1.90495,-0.94011 -3.29037,-2.54818 -1.36067,-1.63281 -2.15234,-3.78516 -0.76693,-2.15234 -0.76693,-4.57682 0,-2.42448 0.76693,-4.57682 0.79167,-2.17709 2.15234,-3.76042 1.38542,-1.60807 3.29037,-2.52344 1.90495,-0.9401 4.13151,-0.9401 1.92969,0 3.4388,0.66797 1.50912,0.64323 2.99349,1.95442 v -2.07812 h 5.1211 z m -5.1211,-16.67448 q -0.91536,-1.01433 -2.375,-1.53386 -1.43489,-0.54427 -2.79557,-0.54427 -2.89453,0 -4.70052,2.02865 -1.78125,2.02864 -1.78125,5.17057 0,1.55859 0.47005,2.89453 0.49479,1.3112 1.33594,2.27604 0.86588,0.96485 2.05338,1.53386 1.21224,0.54427 2.6224,0.54427 1.36068,0 2.79557,-0.54427 1.45964,-0.56901 2.375,-1.58334 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path979"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;fill-opacity:1;stroke-width:1.03365779px"
-         d="m 514.82951,869.21057 h -5.12109 v -14.22526 q 0,-2.69661 -1.01433,-3.73568 -1.01432,-1.03906 -2.94401,-1.03906 -2.84505,0 -4.65104,2.30078 -1.78125,2.30078 -1.78125,6.35808 v 10.34114 h -5.12109 v -23.05729 h 5.12109 v 5.78906 q 0.76693,-2.99349 2.84505,-4.65104 2.07813,-1.68229 5.1211,-1.68229 3.53776,0 5.54166,2.30078 2.00391,2.30078 2.00391,7.07552 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path981"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;fill-opacity:1;stroke-width:1.03365779px"
-         d="m 518.90503,846.15328 h 5.12109 v 14.25 q 0,2.67187 1.01433,3.71094 1.01432,1.03906 2.94401,1.03906 2.82031,0 4.6263,-2.30078 1.80599,-2.30078 1.80599,-6.35807 v -10.34115 h 5.12109 v 23.05729 h -5.12109 v -5.76432 q -0.76693,2.96875 -2.84505,4.65104 -2.07813,1.68229 -5.1211,1.68229 -3.53776,0 -5.54166,-2.30078 -2.00391,-2.32552 -2.00391,-7.07552 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path983"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;fill-opacity:1;stroke-width:1.03365779px"
-         d="m 575.70451,869.21057 h -5.12109 v -14.22526 q 0,-2.69661 -1.01433,-3.73568 -1.01432,-1.03906 -2.94401,-1.03906 -2.84505,0 -4.65104,2.30078 -1.78125,2.30078 -1.78125,6.35808 v 10.34114 h -5.12109 v -23.05729 h 5.12109 v 5.78906 q 0.76693,-2.99349 2.84505,-4.65104 2.07813,-1.68229 5.1211,-1.68229 3.53776,0 5.54167,2.30078 2.0039,2.30078 2.0039,7.07552 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path985"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;fill-opacity:1;stroke-width:1.03365779px"
-         d="m 583.76832,859.63635 q 0.37109,2.375 2.2513,3.95834 1.90495,1.55859 5.09635,1.55859 2.4987,0 4.32943,-0.76693 1.85547,-0.79166 3.19141,-2.07812 l 2.62239,3.61198 q -2.22656,2.22656 -4.72526,3.04297 -2.47396,0.8164 -5.41797,0.8164 -2.67187,0 -4.97265,-0.89062 -2.30079,-0.89063 -3.98308,-2.47396 -1.68229,-1.60807 -2.64713,-3.8099 -0.94011,-2.20182 -0.94011,-4.89844 0,-2.62239 0.86589,-4.82421 0.89062,-2.22657 2.47396,-3.83464 1.60807,-1.63281 3.83463,-2.52344 2.22657,-0.91536 4.92318,-0.91536 2.79557,0 5.07161,0.96484 2.27605,0.94011 3.88412,2.7461 1.63281,1.80599 2.54818,4.42838 0.91536,2.59766 0.91536,5.88802 z m 13.53255,-4.5026 q -0.39584,-2.22656 -2.30078,-3.5625 -1.90495,-1.36068 -4.32943,-1.36068 -2.42448,0 -4.35417,1.36068 -1.92968,1.33594 -2.32552,3.5625 z"
-         inkscape:connector-curvature="0" />
-      <path
-         id="path987"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;fill-opacity:1;stroke-width:1.03365779px"
-         d="m 627.08081,861.86291 q -0.39583,3.63672 -2.86979,5.78907 -2.44922,2.1276 -6.13542,2.1276 -2.02864,0 -3.71094,-0.66797 -1.68229,-0.66797 -2.86979,-1.85547 -1.1875,-1.1875 -1.85547,-2.84505 -0.64322,-1.68229 -0.64322,-3.66146 v -9.97005 h -5.22006 v -4.6263 h 5.22006 v -9.22787 h 5.12109 v 9.22787 h 9.67318 v 4.6263 h -9.67318 v 9.97005 q 0,2.22657 1.08854,3.31511 1.08854,1.08854 2.86979,1.08854 2.17709,0 3.24089,-1.26172 1.0638,-1.26172 1.26172,-3.04297 z"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/contrib/branding/logo/gnunet-logo-dark-text.svg b/contrib/branding/logo/gnunet-logo-dark-text.svg
deleted file mode 100644
index 5644e0ae7..000000000
--- a/contrib/branding/logo/gnunet-logo-dark-text.svg
+++ /dev/null
@@ -1,1411 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<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:xlink="http://www.w3.org/1999/xlink"
-   version="1.1"
-   id="svg2"
-   height="280"
-   width="320">
-  <title
-     id="title3310">logo for GNUnet</title>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="gnunet">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:0.58431375;"
-         offset="0"
-         id="stop9516" />
-      <stop
-         style="stop-color:#ffcc00;stop-opacity:1;"
-         offset="1"
-         id="stop9518" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4094">
-      <stop
-         style="stop-color:#232323;stop-opacity:1;"
-         offset="0"
-         id="stop4096" />
-      <stop
-         style="stop-color:#4d4d4d;stop-opacity:1;"
-         offset="1"
-         id="stop4098" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4014">
-      <stop
-         style="stop-color:#a0a0a0;stop-opacity:1;"
-         offset="0"
-         id="stop4016" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="1"
-         id="stop4018" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4678">
-      <stop
-         style="stop-color:#e5e5e5;stop-opacity:1;"
-         offset="0"
-         id="stop4680" />
-      <stop
-         style="stop-color:#d3cdcd;stop-opacity:1;"
-         offset="1"
-         id="stop4682" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4341">
-      <stop
-         id="stop4343"
-         offset="0"
-         style="stop-color:#333333;stop-opacity:1;" />
-      <stop
-         id="stop4345"
-         offset="1"
-         style="stop-color:#484848;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4696-5">
-      <stop
-         id="stop4698-6"
-         offset="0"
-         style="stop-color:#ffb638;stop-opacity:1;" />
-      <stop
-         id="stop4700-2"
-         offset="1"
-         style="stop-color:#f0ae26;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4702-3-6">
-      <stop
-         id="stop4704-1"
-         offset="0"
-         style="stop-color:#ff0000;stop-opacity:0.58431375;" />
-      <stop
-         id="stop4706-8"
-         offset="1"
-         style="stop-color:#ffcc00;stop-opacity:1;" />
-    </linearGradient>
-    <color-profile
-       name="Artifex-PS-CMYK-Profile"
-       xlink:href="/usr/share/color/icc/ghostscript/ps_cmyk.icc"
-       id="color-profile27" />
-    <linearGradient
-       y2="69.791016"
-       x2="177.04297"
-       y1="63.65625"
-       x1="142.96875"
-       gradientTransform="matrix(-0.88803314,0,0,0.88803314,595.57001,1106.9291)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3138"
-       xlink:href="#linearGradient4702-3-6" />
-    <linearGradient
-       y2="1043.709"
-       x2="80.655251"
-       y1="1025.709"
-       x1="108.08774"
-       gradientTransform="matrix(-0.49726789,0,0,0.49726789,555.31016,722.70088)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3141"
-       xlink:href="#linearGradient4696-5" />
-    <linearGradient
-       y2="922.07178"
-       x2="78.000107"
-       y1="1004.8033"
-       x1="113.5146"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.18739,350.00262)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3144"
-       xlink:href="#linearGradient4702-3-6" />
-    <linearGradient
-       y2="70.667412"
-       x2="176.60477"
-       y1="63.65625"
-       x1="142.96875"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.2161,1106.9294)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3148"
-       xlink:href="#linearGradient4702-3-6" />
-    <linearGradient
-       y2="70.667412"
-       x2="176.60477"
-       y1="63.65625"
-       x1="142.96875"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.2161,1106.9294)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3780"
-       xlink:href="#linearGradient4702-3-6" />
-    <linearGradient
-       y2="922.07178"
-       x2="78.000107"
-       y1="1004.8033"
-       x1="113.5146"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.18739,350.00262)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3782"
-       xlink:href="#linearGradient4702-3-6" />
-    <linearGradient
-       y2="1043.709"
-       x2="80.655251"
-       y1="1025.709"
-       x1="108.08774"
-       gradientTransform="matrix(-0.49726789,0,0,0.49726789,555.31016,722.70088)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3784"
-       xlink:href="#linearGradient4696-5" />
-    <linearGradient
-       y2="69.791016"
-       x2="177.04297"
-       y1="63.65625"
-       x1="142.96875"
-       gradientTransform="matrix(-0.88803314,0,0,0.88803314,595.57001,1106.9291)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3786"
-       xlink:href="#linearGradient4702-3-6" />
-    <filter
-       id="filter9204"
-       style="color-interpolation-filters:sRGB">
-      <feColorMatrix
-         id="feColorMatrix9194"
-         result="colormatrix"
-         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 -0.2125 -0.7154 -0.0721 1 0 "
-         in="SourceGraphic" />
-      <feComposite
-         k1="0"
-         id="feComposite9196"
-         result="composite"
-         k4="0"
-         k3="0"
-         k2="1"
-         operator="arithmetic"
-         in2="colormatrix"
-         in="SourceGraphic" />
-      <feGaussianBlur
-         id="feGaussianBlur9198"
-         result="blur1"
-         stdDeviation="5 0.01" />
-      <feGaussianBlur
-         id="feGaussianBlur9200"
-         result="blur2"
-         stdDeviation="0.01 5"
-         in="composite" />
-      <feBlend
-         id="feBlend9202"
-         result="blend"
-         mode="darken"
-         in2="blur1"
-         in="blur2" />
-    </filter>
-    <filter
-       id="filter9330"
-       style="color-interpolation-filters:sRGB">
-      <feGaussianBlur
-         id="feGaussianBlur9328"
-         result="blur"
-         stdDeviation="2 2" />
-    </filter>
-  </defs>
-  <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>logo for GNUnet</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Luis Felipe López Acevedo, Amirouche Boubekki, carlo von lynX</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>GNUnet e.V.</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-        <dc:description />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="g5346"
-     style="display:none"
-     transform="translate(-387.41463,-609.81931)">
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="453.95291"
-       y="869.96057"
-       id="text5344"><tspan
-         id="tspan5342"
-         x="453.95291"
-         y="869.96057"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.33333206px;font-family:'Ubuntu Bold';-inkscape-font-specification:'Ubuntu Bold, ';fill:#ffffff;stroke-width:1.03365779px"
-         dx="0 0 0">gnu net</tspan></text>
-  </g>
-  <g
-     transform="translate(-387.41463,-609.81931)"
-     style="display:none"
-     id="g950">
-    <text
-       id="text948"
-       y="869.21057"
-       x="467.77612"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         dx="0 -2.5 -3 0 -19.25 -2.5 -3"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#ffffff;stroke-width:1.03365779px"
-         y="869.21057"
-         x="467.77612"
-         id="tspan946">gnu net</tspan></text>
-  </g>
-  <g
-     id="g941"
-     style="display:none"
-     transform="translate(0,-20)">
-    <ellipse
-       ry="17.690269"
-       rx="17.68549"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#ee0000;stroke-width:1.68696308;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse937"
-       cx="157.97346"
-       cy="180.65355" />
-    <ellipse
-       ry="17.690269"
-       rx="17.68549"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#ee0000;stroke-width:1.68696308;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse939"
-       cx="157.97346"
-       cy="111.16864" />
-  </g>
-  <g
-     transform="translate(-387.41463,-609.81931)"
-     style="display:none"
-     id="g935">
-    <g
-       aria-label="gnu net"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;image-rendering:auto"
-       id="g933">
-      <path
-         d="m 423.90503,684.79003 h 22.14128 v 61.61056 q 0,11.55196 4.3855,16.04443 4.38546,4.49242 12.72857,4.49242 12.19374,0 20.00203,-9.94753 7.80828,-9.94753 7.80828,-27.48942 v -44.71046 h 22.14128 v 99.6893 h -22.14128 v -24.92231 q -3.31586,12.83553 -12.30071,20.10899 -8.98489,7.27346 -22.14132,7.27346 -15.29567,0 -23.95963,-9.94753 -8.664,-10.0545 -8.664,-30.59135 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#ffffff;stroke-width:4.46906853px"
-         id="path925" />
-      <path
-         d="m 669.48029,784.47933 h -22.14128 v -61.50359 q 0,-11.65892 -4.3855,-16.15139 -4.38546,-4.49243 -12.72857,-4.49243 -12.30071,0 -20.10899,9.94753 -7.70132,9.94754 -7.70132,27.48947 v 44.71041 h -22.14128 v -99.6893 h 22.14128 v 25.02928 q 3.31586,-12.94249 12.30071,-20.10899 8.98489,-7.27346 22.14132,-7.27346 15.29567,0 23.95967,9.94753 8.66396,9.94753 8.66396,30.59135 z"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#ffffff;stroke-width:4.46906853px"
-         id="path927" />
-    </g>
-  </g>
-  <g
-     id="g1296"
-     style="display:none"
-     transform="translate(0,-67.278107)">
-    <path
-       style="fill:none;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 62.698223,85.778107 -39.5,48.000003 v 0 l -1,2"
-       id="path1256" />
-    <path
-       style="fill:none;stroke:#dddddd;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 12.698223,104.77811 10,29 21,-10.5 v 0 0"
-       id="path1258" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 11.809253,105.24526 63.6227,34.91188 23.31802,-11.09978 -35.03955,28.74946 11.86161,-17.77468 -53.18435,-5.79678 40.95076,23.69646 25.32406,0.49689 24.193047,3.02495 v 48.02104 l 21.04995,-32.14943 -20.559,-15.87161 32.52749,48.02104 -8.06937,31.38386 -24.94907,-31.76198 24.94907,77.51429 22.25436,-36.69889 21.97354,37.07701 -43.59987,-0.37188 41.32877,-28.87448 22.05899,-21.17152 -19.90986,50.171 -3.71591,-29.60613 -8.57843,-31.7682 -9.69437,24.71516 54.37611,-52.19866 -24.96716,8.94671 -18.39175,19.15282 18.27579,-55.07718 25.20812,27.362 20.66591,-41.35238 -46.00204,14.12783 22.94304,-37.07431 23.05297,23.0777 31.8814,-26.48075 40.07874,-25.58708 -15.26372,39.20869 -24.69305,-13.74039 -55.05634,4.03119 79.62738,9.58108 -56.57441,12.73416"
-       id="path1260" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 98.868943,129.31358 37.045597,48.02106"
-       id="path1262" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 88.284483,158.4287 10.96248,-29.11512 12.474537,32.51819"
-       id="path1264" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 212.13974,133.78236 54.69043,-3.64603 -31.75647,27.04795"
-       id="path1266" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#dddddd;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 399.11285,648.31931 50.5,-19.5 -14.05,28.1 0.925,-1.725 -5.875,11.75 -0.25,-0.75"
-       id="path1268" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:#729fcf;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 601.57854,741.42859 -2.26809,-64.28015"
-       id="path1270" />
-    <path
-       style="fill:none;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 189.57322,206.52811 -44,2.625 25.375,17.125 v 0"
-       id="path1272" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 475.69911,700.21367 24.57107,51.42411"
-       id="path1274" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 534.29164,751.63778 12.85257,40.08057"
-       id="path1276" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 525.21925,783.02162 0.37803,45.75234"
-       id="path1278" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 601.95657,742.56293 -12.09653,36.6775"
-       id="path1280" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 475.69911,700.59178 46.98395,22.0278 10.85256,28.26194"
-       id="path1282" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 589.104,778.86231 -12.85255,-66.17074 v 36.6775 z"
-       id="path1284" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 557.35064,768.27501 31.75336,10.5873"
-       id="path1286" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 500.27018,704.37298 v 48.77728 l 24.57105,30.2495 23.81505,9.45293"
-       id="path1288" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 524.46323,829.53019 44.98392,-0.37812"
-       id="path1290" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;stroke:#dddddd;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 694.61285,647.31931 -40.285,-17.00922 -4.715,-1.99078 29,57.5 v -0.5 0 h 0.5 v 0"
-       id="path1292" />
-    <path
-       transform="translate(-387.41463,-542.5412)"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#dddddd;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 409.92428,677.14844 54.05634,6.0499"
-       id="path1294" />
-  </g>
-  <g
-     transform="translate(0,-67.278107)"
-     style="display:none"
-     id="g1254">
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="829.24042"
-       cx="568.98083"
-       id="ellipse1194"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1196"
-       cx="588.85413"
-       cy="778.67493" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="740.67249"
-       cx="601.57867"
-       id="ellipse1198"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1200"
-       cx="525.79852"
-       cy="829.24042" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1202"
-       cx="557.82654"
-       cy="768.71582" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="783.02173"
-       cx="525.21936"
-       id="ellipse1204"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1206"
-       cx="400.09586"
-       cy="647.34271" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1208"
-       cx="450.11285"
-       cy="628.31934" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1210"
-       cx="622.36951"
-       cy="699.45752" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1212"
-       cx="547.21771"
-       cy="792.29773" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1214"
-       cx="566.20697"
-       cy="800.12549" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="751.63794"
-       cx="500.64822"
-       id="ellipse1216"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1218"
-       cx="533.33447"
-       cy="751.72632" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1220"
-       cx="450.75012"
-       cy="699.83545" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="700.59174"
-       cx="476.07718"
-       id="ellipse1222"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1224"
-       cx="521.49146"
-       cy="719.65314" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1226"
-       cx="500.6362"
-       cy="703.87305" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="134.28851"
-       cx="211.9584"
-       id="ellipse1228"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1230"
-       cx="576.62964"
-       cy="713.44794" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="123.16669"
-       cx="43.166531"
-       id="ellipse1232"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1234"
-       cx="98.865997"
-       cy="129.43542" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="130.05022"
-       cx="267.08618"
-       id="ellipse1236"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1238"
-       cx="679.07196"
-       cy="686.22339" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="748.99109"
-       cx="577.00763"
-       id="ellipse1240"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1242"
-       cx="577.00763"
-       cy="748.99109" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="748.99109"
-       cx="577.07013"
-       id="ellipse1244"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(0,-3e-6)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="133.85095"
-       cx="22.887779"
-       id="ellipse1246"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="682.1922"
-       cx="462.47165"
-       id="ellipse1248"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="647.3053"
-       cx="694.58264"
-       id="ellipse1250"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <ellipse
-       transform="translate(-387.41463,-542.5412)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#ffffff;fill-opacity:1;stroke:#eeeeee;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1252"
-       cx="649.61285"
-       cy="628.31934" />
-  </g>
-  <g
-     transform="translate(0,-67.278107)"
-     style="display:inline"
-     id="g1533">
-    <path
-       id="path1493"
-       d="m 62.698223,85.778107 -39.5,48.000003 v 0 l -1,2"
-       style="fill:none;stroke:#3399cc;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path1495"
-       d="m 12.698223,104.77811 10,29 21,-10.5 v 0 0"
-       style="fill:none;stroke:#3399cc;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path1497"
-       d="m 11.809253,105.24526 63.6227,34.91188 23.31802,-11.09978 -35.03955,28.74946 11.86161,-17.77468 -53.18435,-5.79678 40.95076,23.69646 25.32406,0.49689 24.193047,3.02495 v 48.02104 l 21.04995,-32.14943 -20.559,-15.87161 32.52749,48.02104 -8.06937,31.38386 -24.94907,-31.76198 24.94907,77.51429 22.25436,-36.69889 21.97354,37.07701 -43.59987,-0.37188 41.32877,-28.87448 22.05899,-21.17152 -19.90986,50.171 -3.71591,-29.60613 -8.57843,-31.7682 -9.69437,24.71516 54.37611,-52.19866 -24.96716,8.94671 -18.39175,19.15282 18.27579,-55.07718 25.20812,27.362 20.66591,-41.35238 -46.00204,14.12783 22.94304,-37.07431 23.05297,23.0777 31.8814,-26.48075 40.07874,-25.58708 -15.26372,39.20869 -24.69305,-13.74039 -55.05634,4.03119 79.62738,9.58108 -56.57441,12.73416"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path1499"
-       d="m 98.868943,129.31358 37.045597,48.02106"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path1501"
-       d="m 88.284483,158.4287 10.96248,-29.11512 12.474537,32.51819"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path1503"
-       d="m 212.13974,133.78236 54.69043,-3.64603 -31.75647,27.04795"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path1505"
-       d="m 399.11285,648.31931 50.5,-19.5 -14.05,28.1 0.925,-1.725 -5.875,11.75 -0.25,-0.75"
-       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#3399cc;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1507"
-       d="m 601.57854,741.42859 -2.26809,-64.28015"
-       style="display:inline;opacity:1;fill:#729fcf;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1509"
-       d="m 189.57322,206.52811 -44,2.625 25.375,17.125 v 0"
-       style="fill:none;stroke:#3399cc;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       id="path1511"
-       d="m 475.69911,700.21367 24.57107,51.42411"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1513"
-       d="m 534.29164,751.63778 12.85257,40.08057"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1515"
-       d="m 525.21925,783.02162 0.37803,45.75234"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1517"
-       d="m 601.95657,742.56293 -12.09653,36.6775"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1519"
-       d="m 475.69911,700.59178 46.98395,22.0278 10.85256,28.26194"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1521"
-       d="m 589.104,778.86231 -12.85255,-66.17074 v 36.6775 z"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1523"
-       d="m 557.35064,768.27501 31.75336,10.5873"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1525"
-       d="m 500.27018,704.37298 v 48.77728 l 24.57105,30.2495 23.81505,9.45293"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1527"
-       d="m 524.46323,829.53019 44.98392,-0.37812"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1529"
-       d="m 694.61285,647.31931 -40.285,-17.00922 -4.715,-1.99078 29,57.5 v -0.5 0 h 0.5 v 0"
-       style="display:inline;opacity:1;fill:none;stroke:#3399cc;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path1531"
-       d="m 409.92428,677.14844 54.05634,6.0499"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#3399cc;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       transform="translate(-387.41463,-542.5412)" />
-  </g>
-  <g
-     id="g1491"
-     style="display:inline"
-     transform="translate(0,-67.278107)">
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1431"
-       cx="568.98083"
-       cy="829.24042"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="778.67493"
-       cx="588.85413"
-       id="ellipse1433"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1435"
-       cx="601.57867"
-       cy="740.67249"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="829.24042"
-       cx="525.79852"
-       id="ellipse1437"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="768.71582"
-       cx="557.82654"
-       id="ellipse1439"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1441"
-       cx="525.21936"
-       cy="783.02173"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="647.34271"
-       cx="400.09586"
-       id="ellipse1443"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="628.31934"
-       cx="450.11285"
-       id="ellipse1445"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="699.45752"
-       cx="622.36951"
-       id="ellipse1447"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="792.29773"
-       cx="547.21771"
-       id="ellipse1449"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="800.12549"
-       cx="566.20697"
-       id="ellipse1451"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1453"
-       cx="500.64822"
-       cy="751.63794"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="751.72632"
-       cx="533.33447"
-       id="ellipse1455"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="699.83545"
-       cx="450.75012"
-       id="ellipse1457"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1459"
-       cx="476.07718"
-       cy="700.59174"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="719.65314"
-       cx="521.49146"
-       id="ellipse1461"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="703.87305"
-       cx="500.6362"
-       id="ellipse1463"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1465"
-       cx="211.9584"
-       cy="134.28851"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="713.44794"
-       cx="576.62964"
-       id="ellipse1467"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1469"
-       cx="43.166531"
-       cy="123.16669"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="129.43542"
-       cx="98.865997"
-       id="ellipse1471"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1473"
-       cx="267.08618"
-       cy="130.05022"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="686.22339"
-       cx="679.07196"
-       id="ellipse1475"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1477"
-       cx="577.00763"
-       cy="748.99109"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="748.99109"
-       cx="577.00763"
-       id="ellipse1479"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1481"
-       cx="577.07013"
-       cy="748.99109"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1483"
-       cx="22.887779"
-       cy="133.85095"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(0,-3e-6)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1485"
-       cx="462.47165"
-       cy="682.1922"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1487"
-       cx="694.58264"
-       cy="647.3053"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="628.31934"
-       cx="649.61285"
-       id="ellipse1489"
-       style="display:inline;opacity:1;fill:#419edb;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-  </g>
-  <g
-     id="g1539"
-     style="display:inline"
-     transform="translate(0,-20)">
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3399cc;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1535"
-       cx="159.80099"
-       cy="276.32968" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3399cc;fill-opacity:1;stroke:#3399cc;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse1537"
-       cx="159.80099"
-       cy="259.99252" />
-  </g>
-  <g
-     transform="translate(0,-67.278107)"
-     style="display:none"
-     id="layer3">
-    <path
-       id="path5313"
-       d="m 62.698223,85.778107 -39.5,48.000003 v 0 l -1,2"
-       style="fill:none;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" />
-    <path
-       id="path5311"
-       d="m 12.698223,104.77811 10,29 21,-10.5 v 0 0"
-       style="fill:none;stroke:#cc0000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" />
-    <path
-       id="path9316"
-       d="m 11.809253,105.24526 63.6227,34.91188 23.31802,-11.09978 -35.03955,28.74946 11.86161,-17.77468 -53.18435,-5.79678 40.95076,23.69646 25.32406,0.49689 24.193047,3.02495 v 48.02104 l 21.04995,-32.14943 -20.559,-15.87161 32.52749,48.02104 -8.06937,31.38386 -24.94907,-31.76198 24.94907,77.51429 22.25436,-36.69889 21.97354,37.07701 -43.59987,-0.37188 41.32877,-28.87448 22.05899,-21.17152 -19.90986,50.171 -3.71591,-29.60613 -8.57843,-31.7682 -9.69437,24.71516 54.37611,-52.19866 -24.96716,8.94671 -18.39175,19.15282 18.27579,-55.07718 25.20812,27.362 20.66591,-41.35238 -46.00204,14.12783 22.94304,-37.07431 23.05297,23.0777 31.8814,-26.48075 40.07874,-25.58708 -15.26372,39.20869 -24.69305,-13.74039 -55.05634,4.03119 79.62738,9.58108 -56.57441,12.73416"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" />
-    <path
-       id="path9318"
-       d="m 98.868943,129.31358 37.045597,48.02106"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" />
-    <path
-       id="path12058"
-       d="m 88.284483,158.4287 10.96248,-29.11512 12.474537,32.51819"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" />
-    <path
-       id="path12250"
-       d="m 212.13974,133.78236 54.69043,-3.64603 -31.75647,27.04795"
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" />
-    <path
-       id="path5161"
-       d="m 399.11285,648.31931 50.5,-19.5 -14.05,28.1 0.925,-1.725 -5.875,11.75 -0.25,-0.75"
-       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#cc0000;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path12206"
-       d="m 601.57854,741.42859 -2.26809,-64.28015"
-       style="display:inline;opacity:1;fill:#729fcf;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path5331"
-       d="m 189.57322,206.52811 -44,2.625 25.375,17.125 v 0"
-       style="fill:none;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843" />
-    <path
-       id="path9320"
-       d="m 475.69911,700.21367 24.57107,51.42411"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path9322"
-       d="m 534.29164,751.63778 12.85257,40.08057"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path9324"
-       d="m 525.21925,783.02162 0.37803,45.75234"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path9326"
-       d="m 601.95657,742.56293 -12.09653,36.6775"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path12060"
-       d="m 475.69911,700.59178 46.98395,22.0278 10.85256,28.26194"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path12208"
-       d="m 589.104,778.86231 -12.85255,-66.17074 v 36.6775 z"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path12210"
-       d="m 557.35064,768.27501 31.75336,10.5873"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path12212"
-       d="m 500.27018,704.37298 v 48.77728 l 24.57105,30.2495 23.81505,9.45293"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path12216"
-       d="m 524.46323,829.53019 44.98392,-0.37812"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path5163"
-       d="m 694.61285,647.31931 -40.285,-17.00922 -4.715,-1.99078 29,57.5 v -0.5 0 h 0.5 v 0"
-       style="display:inline;opacity:1;fill:none;stroke:#cc0000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-    <path
-       id="path12214"
-       d="m 409.92428,677.14844 54.05634,6.0499"
-       style="display:inline;opacity:1;fill:none;fill-rule:evenodd;stroke:#cc0000;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.99607843"
-       transform="translate(-387.41463,-542.5412)" />
-  </g>
-  <g
-     id="g325"
-     style="display:none"
-     transform="translate(0,-67.278107)">
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12254"
-       cx="568.98083"
-       cy="829.24042"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="778.67493"
-       cx="588.85413"
-       id="ellipse12290"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12284"
-       cx="601.57867"
-       cy="740.67249"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="829.24042"
-       cx="525.79852"
-       id="ellipse12256"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="768.71582"
-       cx="557.82654"
-       id="ellipse12306"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12280"
-       cx="525.21936"
-       cy="783.02173"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="647.34271"
-       cx="400.09586"
-       id="ellipse12258"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="628.31934"
-       cx="450.11285"
-       id="ellipse12258-3"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="699.45752"
-       cx="622.36951"
-       id="ellipse12294"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="792.29773"
-       cx="547.21771"
-       id="ellipse12252"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="800.12549"
-       cx="566.20697"
-       id="ellipse12282"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12276"
-       cx="500.64822"
-       cy="751.63794"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="751.72632"
-       cx="533.33447"
-       id="ellipse12278"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="699.83545"
-       cx="450.75012"
-       id="ellipse12262"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12268"
-       cx="476.07718"
-       cy="700.59174"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="719.65314"
-       cx="521.49146"
-       id="ellipse12270"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="703.87305"
-       cx="500.6362"
-       id="ellipse12274"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12292"
-       cx="211.9584"
-       cy="134.28851"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="713.44794"
-       cx="576.62964"
-       id="ellipse12286"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12260"
-       cx="43.166531"
-       cy="123.16669"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="129.43542"
-       cx="98.865997"
-       id="ellipse12266"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12296"
-       cx="267.08618"
-       cy="130.05022"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="686.22339"
-       cx="679.07196"
-       id="ellipse12298"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12288"
-       cx="577.00763"
-       cy="748.99109"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="748.99109"
-       cx="577.00763"
-       id="ellipse12302"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12304"
-       cx="577.07013"
-       cy="748.99109"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12264"
-       cx="22.887779"
-       cy="133.85095"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(0,-3e-6)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12272"
-       cx="462.47165"
-       cy="682.1922"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="ellipse12300"
-       cx="694.58264"
-       cy="647.3053"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-    <ellipse
-       cy="628.31934"
-       cx="649.61285"
-       id="ellipse12258-3-0"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#cc0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       rx="4.1581793"
-       ry="4.1593032"
-       transform="translate(-387.41463,-542.5412)" />
-  </g>
-  <g
-     transform="translate(0,-20)"
-     style="display:none"
-     id="layer6">
-    <ellipse
-       cy="276.32968"
-       cx="159.80099"
-       id="ellipse12282-8-9-0"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#ee0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       rx="4.1581793"
-       ry="4.1593032" />
-    <ellipse
-       cy="259.99252"
-       cx="159.80099"
-       id="ellipse12282-8-9"
-       style="display:inline;opacity:1;fill:#ee0000;fill-opacity:1;stroke:#ee0000;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       rx="4.1581793"
-       ry="4.1593032" />
-  </g>
-  <g
-     id="g975"
-     style="display:inline"
-     transform="translate(-387.41463,-609.81931)">
-    <g
-       id="text973"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;image-rendering:auto"
-       aria-label="gnu net">
-      <path
-         id="path977"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;stroke-width:1.03365779px;fill-opacity:1"
-         d="m 489.62118,868.96318 q 0,2.375 -0.81641,4.23046 -0.81641,1.85547 -2.30078,3.14193 -1.45964,1.28646 -3.46354,1.95443 -1.97917,0.69271 -4.42839,0.69271 -6.01172,0 -10.26693,-3.63672 l 2.42448,-3.95834 q 3.53776,3.04297 7.84245,3.04297 2.64714,0 4.25521,-1.31119 1.63281,-1.28646 1.63281,-4.0573 v -2.47395 q -1.58333,1.36067 -3.04297,2.02864 -1.45963,0.64323 -3.38932,0.64323 -2.22656,0 -4.13151,-0.9401 -1.90495,-0.94011 -3.29037,-2.54818 -1.36067,-1.63281 -2.15234,-3.78516 -0.76693,-2.15234 -0.76693,-4.57682 0,-2.42448 0.76693,-4.57682 0.79167,-2.17709 2.15234,-3.76042 1.38542,-1.60807 3.29037,-2.52344 1.90495,-0.9401 4.13151,-0.9401 1.92969,0 3.4388,0.66797 1.50912,0.64323 2.99349,1.95442 v -2.07812 h 5.1211 z m -5.1211,-16.67448 q -0.91536,-1.01433 -2.375,-1.53386 -1.43489,-0.54427 -2.79557,-0.54427 -2.89453,0 -4.70052,2.02865 -1.78125,2.02864 -1.78125,5.17057 0,1.55859 0.47005,2.89453 0.49479,1.3112 1.33594,2.27604 0.86588,0.96485 2.05338,1.53386 1.21224,0.54427 2.6224,0.54427 1.36068,0 2.79557,-0.54427 1.45964,-0.56901 2.375,-1.58334 z" />
-      <path
-         id="path979"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;stroke-width:1.03365779px;fill-opacity:1"
-         d="m 514.82951,869.21057 h -5.12109 v -14.22526 q 0,-2.69661 -1.01433,-3.73568 -1.01432,-1.03906 -2.94401,-1.03906 -2.84505,0 -4.65104,2.30078 -1.78125,2.30078 -1.78125,6.35808 v 10.34114 h -5.12109 v -23.05729 h 5.12109 v 5.78906 q 0.76693,-2.99349 2.84505,-4.65104 2.07813,-1.68229 5.1211,-1.68229 3.53776,0 5.54166,2.30078 2.00391,2.30078 2.00391,7.07552 z" />
-      <path
-         id="path981"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;stroke-width:1.03365779px;fill-opacity:1"
-         d="m 518.90503,846.15328 h 5.12109 v 14.25 q 0,2.67187 1.01433,3.71094 1.01432,1.03906 2.94401,1.03906 2.82031,0 4.6263,-2.30078 1.80599,-2.30078 1.80599,-6.35807 v -10.34115 h 5.12109 v 23.05729 h -5.12109 v -5.76432 q -0.76693,2.96875 -2.84505,4.65104 -2.07813,1.68229 -5.1211,1.68229 -3.53776,0 -5.54166,-2.30078 -2.00391,-2.32552 -2.00391,-7.07552 z" />
-      <path
-         id="path983"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;stroke-width:1.03365779px;fill-opacity:1"
-         d="m 575.70451,869.21057 h -5.12109 v -14.22526 q 0,-2.69661 -1.01433,-3.73568 -1.01432,-1.03906 -2.94401,-1.03906 -2.84505,0 -4.65104,2.30078 -1.78125,2.30078 -1.78125,6.35808 v 10.34114 h -5.12109 v -23.05729 h 5.12109 v 5.78906 q 0.76693,-2.99349 2.84505,-4.65104 2.07813,-1.68229 5.1211,-1.68229 3.53776,0 5.54167,2.30078 2.0039,2.30078 2.0039,7.07552 z" />
-      <path
-         id="path985"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;stroke-width:1.03365779px;fill-opacity:1"
-         d="m 583.76832,859.63635 q 0.37109,2.375 2.2513,3.95834 1.90495,1.55859 5.09635,1.55859 2.4987,0 4.32943,-0.76693 1.85547,-0.79166 3.19141,-2.07812 l 2.62239,3.61198 q -2.22656,2.22656 -4.72526,3.04297 -2.47396,0.8164 -5.41797,0.8164 -2.67187,0 -4.97265,-0.89062 -2.30079,-0.89063 -3.98308,-2.47396 -1.68229,-1.60807 -2.64713,-3.8099 -0.94011,-2.20182 -0.94011,-4.89844 0,-2.62239 0.86589,-4.82421 0.89062,-2.22657 2.47396,-3.83464 1.60807,-1.63281 3.83463,-2.52344 2.22657,-0.91536 4.92318,-0.91536 2.79557,0 5.07161,0.96484 2.27605,0.94011 3.88412,2.7461 1.63281,1.80599 2.54818,4.42838 0.91536,2.59766 0.91536,5.88802 z m 13.53255,-4.5026 q -0.39584,-2.22656 -2.30078,-3.5625 -1.90495,-1.36068 -4.32943,-1.36068 -2.42448,0 -4.35417,1.36068 -1.92968,1.33594 -2.32552,3.5625 z" />
-      <path
-         id="path987"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#292929;stroke-width:1.03365779px;fill-opacity:1"
-         d="m 627.08081,861.86291 q -0.39583,3.63672 -2.86979,5.78907 -2.44922,2.1276 -6.13542,2.1276 -2.02864,0 -3.71094,-0.66797 -1.68229,-0.66797 -2.86979,-1.85547 -1.1875,-1.1875 -1.85547,-2.84505 -0.64322,-1.68229 -0.64322,-3.66146 v -9.97005 h -5.22006 v -4.6263 h 5.22006 v -9.22787 h 5.12109 v 9.22787 h 9.67318 v 4.6263 h -9.67318 v 9.97005 q 0,2.22657 1.08854,3.31511 1.08854,1.08854 2.86979,1.08854 2.17709,0 3.24089,-1.26172 1.0638,-1.26172 1.26172,-3.04297 z" />
-    </g>
-  </g>
-</svg>
diff --git a/contrib/branding/logo/gnunet-logo.pdf b/contrib/branding/logo/gnunet-logo.pdf
deleted file mode 100644
index fcc7b10bf..000000000
--- a/contrib/branding/logo/gnunet-logo.pdf
+++ /dev/null
Binary files differ
diff --git a/contrib/branding/logo/gnunet-logo.png b/contrib/branding/logo/gnunet-logo.png
deleted file mode 100644
index 4927a1624..000000000
--- a/contrib/branding/logo/gnunet-logo.png
+++ /dev/null
Binary files differ
diff --git a/contrib/branding/logo/lynXified-amirouche-anonymous-v3.png b/contrib/branding/logo/lynXified-amirouche-anonymous-v3.png
deleted file mode 100644
index 52d7b24fd..000000000
--- a/contrib/branding/logo/lynXified-amirouche-anonymous-v3.png
+++ /dev/null
Binary files differ
diff --git a/contrib/branding/logo/lynXified-amirouche-v3.svg b/contrib/branding/logo/lynXified-amirouche-v3.svg
deleted file mode 100644
index b8dd1ac67..000000000
--- a/contrib/branding/logo/lynXified-amirouche-v3.svg
+++ /dev/null
@@ -1,918 +0,0 @@
-<?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:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="400"
-   height="300"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.2 5c3e80d, 2017-08-06"
-   sodipodi:docname="lynXified-amirouche-v3.svg"
-   inkscape:export-filename="lynXified-amirouche-anonymous-v3.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192">
-  <title
-     id="title3310">Guix System Distribution (Logo)</title>
-  <defs
-     id="defs4">
-    <linearGradient
-       id="gnunet">
-      <stop
-         id="stop9516"
-         offset="0"
-         style="stop-color:#ff0000;stop-opacity:0.58431375;" />
-      <stop
-         id="stop9518"
-         offset="1"
-         style="stop-color:#ffcc00;stop-opacity:1;" />
-    </linearGradient>
-    <inkscape:path-effect
-       effect="vonkoch"
-       id="path-effect8912"
-       is_visible="true"
-       ref_path="m 386.97986,1494.3277 h 79.02013"
-       generator="m 386.97986,1552.8408 h 26.34004 m 26.34005,0 h 26.34004"
-       similar_only="false"
-       nbgenerations="1"
-       drawall="true"
-       maxComplexity="1000" />
-    <linearGradient
-       id="linearGradient4094">
-      <stop
-         id="stop4096"
-         offset="0"
-         style="stop-color:#232323;stop-opacity:1;" />
-      <stop
-         id="stop4098"
-         offset="1"
-         style="stop-color:#4d4d4d;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4014">
-      <stop
-         id="stop4016"
-         offset="0"
-         style="stop-color:#a0a0a0;stop-opacity:1;" />
-      <stop
-         id="stop4018"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4678">
-      <stop
-         id="stop4680"
-         offset="0"
-         style="stop-color:#e5e5e5;stop-opacity:1;" />
-      <stop
-         id="stop4682"
-         offset="1"
-         style="stop-color:#d3cdcd;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4341">
-      <stop
-         style="stop-color:#333333;stop-opacity:1;"
-         offset="0"
-         id="stop4343" />
-      <stop
-         style="stop-color:#484848;stop-opacity:1;"
-         offset="1"
-         id="stop4345" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4696-5">
-      <stop
-         style="stop-color:#ffb638;stop-opacity:1;"
-         offset="0"
-         id="stop4698-6" />
-      <stop
-         style="stop-color:#f0ae26;stop-opacity:1;"
-         offset="1"
-         id="stop4700-2" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4702-3-6">
-      <stop
-         style="stop-color:#ff0000;stop-opacity:0.58431375;"
-         offset="0"
-         id="stop4704-1" />
-      <stop
-         style="stop-color:#ffcc00;stop-opacity:1;"
-         offset="1"
-         id="stop4706-8" />
-    </linearGradient>
-    <color-profile
-       id="color-profile26"
-       xlink:href="/usr/share/color/icc/ghostscript/ps_cmyk.icc"
-       name="Artifex-PS-CMYK-Profile" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4702-3-6"
-       id="linearGradient3138"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.88803314,0,0,0.88803314,595.57001,1106.9291)"
-       x1="142.96875"
-       y1="63.65625"
-       x2="177.04297"
-       y2="69.791016" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4696-5"
-       id="linearGradient3141"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.49726789,0,0,0.49726789,555.31016,722.70088)"
-       x1="108.08774"
-       y1="1025.709"
-       x2="80.655251"
-       y2="1043.709" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4702-3-6"
-       id="linearGradient3144"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.18739,350.00262)"
-       x1="113.5146"
-       y1="1004.8033"
-       x2="78.000107"
-       y2="922.07178" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4702-3-6"
-       id="linearGradient3148"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.2161,1106.9294)"
-       x1="142.96875"
-       y1="63.65625"
-       x2="176.60477"
-       y2="70.667412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4702-3-6"
-       id="linearGradient3780"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.2161,1106.9294)"
-       x1="142.96875"
-       y1="63.65625"
-       x2="176.60477"
-       y2="70.667412" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4702-3-6"
-       id="linearGradient3782"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.88803314,0,0,0.88803314,415.18739,350.00262)"
-       x1="113.5146"
-       y1="1004.8033"
-       x2="78.000107"
-       y2="922.07178" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4696-5"
-       id="linearGradient3784"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.49726789,0,0,0.49726789,555.31016,722.70088)"
-       x1="108.08774"
-       y1="1025.709"
-       x2="80.655251"
-       y2="1043.709" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4702-3-6"
-       id="linearGradient3786"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.88803314,0,0,0.88803314,595.57001,1106.9291)"
-       x1="142.96875"
-       y1="63.65625"
-       x2="177.04297"
-       y2="69.791016" />
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Cross Blur"
-       id="filter9204">
-      <feColorMatrix
-         in="SourceGraphic"
-         values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 -0.2125 -0.7154 -0.0721 1 0 "
-         result="colormatrix"
-         id="feColorMatrix9194" />
-      <feComposite
-         in="SourceGraphic"
-         in2="colormatrix"
-         operator="arithmetic"
-         k2="1"
-         k3="0"
-         k4="0"
-         result="composite"
-         id="feComposite9196"
-         k1="0" />
-      <feGaussianBlur
-         stdDeviation="5 0.01"
-         result="blur1"
-         id="feGaussianBlur9198" />
-      <feGaussianBlur
-         in="composite"
-         stdDeviation="0.01 5"
-         result="blur2"
-         id="feGaussianBlur9200" />
-      <feBlend
-         in="blur2"
-         in2="blur1"
-         mode="darken"
-         result="blend"
-         id="feBlend9202" />
-    </filter>
-    <filter
-       style="color-interpolation-filters:sRGB"
-       inkscape:label="Blur"
-       id="filter9330">
-      <feGaussianBlur
-         stdDeviation="2 2"
-         result="blur"
-         id="feGaussianBlur9328" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#e73520"
-     borderopacity="1"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="185.65271"
-     inkscape:cy="142.71577"
-     inkscape:document-units="px"
-     inkscape:current-layer="g950"
-     showgrid="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="835"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="false"
-     showborder="true"
-     borderlayer="true"
-     inkscape:object-nodes="true"
-     inkscape:snap-global="true"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     objecttolerance="20"
-     inkscape:snap-tangential="true"
-     inkscape:snap-perpendicular="true"
-     inkscape:pagecheckerboard="true"
-     fit-margin-top="10"
-     fit-margin-left="10"
-     fit-margin-right="10"
-     fit-margin-bottom="10"
-     inkscape:snap-path-clip="true"
-     inkscape:snap-path-mask="true">
-    <sodipodi:guide
-       position="-307.43549,820.27825"
-       orientation="1,0"
-       id="guide5092"
-       inkscape:locked="false" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid8783"
-       originx="0"
-       originy="0"
-       spacingx="5"
-       spacingy="5" />
-    <sodipodi:guide
-       position="-280.81043,809.79316"
-       orientation="0,1"
-       id="guide8844"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-297.44255,799.75126"
-       orientation="1,0"
-       id="guide8846"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-286.44639,799.75126"
-       orientation="0,1"
-       id="guide8864"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-227.46698,708.44981"
-       orientation="1,0"
-       id="guide8874"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-217.47047,677.79384"
-       orientation="1,0"
-       id="guide8876"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-219.46978,729.7757"
-       orientation="0,1"
-       id="guide8878"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-158.75928,719.78633"
-       orientation="0,1"
-       id="guide8896"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-147.49491,703.61816"
-       orientation="1,0"
-       id="guide8922"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-213.42311,880.00792"
-       orientation="0,1"
-       id="guide8924"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-357.88081,649.83162"
-       orientation="0,1"
-       id="guide8926"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-137.55348,605.74624"
-       orientation="1,0"
-       id="guide8991"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-231.80147,639.67552"
-       orientation="0,1"
-       id="guide8993"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="-285.31397,844.81632"
-       orientation="0,1"
-       id="guide9013"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="200,352"
-       orientation="1,0"
-       id="guide5070"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="50,215"
-       orientation="1,0"
-       id="guide5335"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="350,137"
-       orientation="1,0"
-       id="guide5337"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="10,275.5"
-       orientation="1,0"
-       id="guide5354"
-       inkscape:locked="false" />
-    <sodipodi:guide
-       position="203.46998,66.733203"
-       orientation="0,1"
-       id="guide5358"
-       inkscape:locked="false" />
-  </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>Guix System Distribution (Logo)</dc:title>
-        <dc:date>2015-02-07</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Luis Felipe López Acevedo</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:rights>
-          <cc:Agent>
-            <dc:title>Luis Felipe López Acevedo</dc:title>
-          </cc:Agent>
-        </dc:rights>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/4.0/" />
-        <dc:description />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/by-sa/4.0/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Notice" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#Attribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-        <cc:requires
-           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="ramen"
-     sodipodi:insensitive="true">
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1.45544064;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect942"
-       width="400"
-       height="300"
-       x="-3.7303494e-14"
-       y="1.7330311e-15" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer4"
-     inkscape:label="bg"
-     style="display:inline"
-     transform="translate(0,-47.278107)"
-     sodipodi:insensitive="true">
-    <rect
-       style="display:inline;opacity:1;vector-effect:none;fill:#421111;fill-opacity:1;stroke:none;stroke-width:1.47144902;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="rect12062"
-       width="380"
-       height="279.99997"
-       x="10"
-       y="57.278107" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="head"
-     style="display:none;opacity:1"
-     transform="translate(0,-47.278107)"
-     sodipodi:insensitive="true">
-    <g
-       transform="matrix(0.40699717,0,0,0.40699717,31.535627,27.300788)"
-       id="layer1-6"
-       inkscape:label="Layer 1"
-       style="fill:#ff0000">
-      <g
-         transform="translate(126.95974,19.57999)"
-         id="Layer_1"
-         style="fill:#ff0000">
-        <g
-           id="g2490"
-           style="fill:#ff0000">
-          <path
-             style="fill:#ff0000;fill-rule:evenodd"
-             d="m 112.993,304.372 c -3.634,0.247 -8.365,1.875 -11.539,7.564 -2.591,4.646 -8.661,5.387 -11.495,4.451 -4.721,-1.56 -10.755,-2.642 -16.6,1.523 -5.845,4.164 -12.157,1.015 -11.05,-6.576 1.107,-7.59 3.849,-14.351 11.127,-18.538 15.895,-9.144 4.848,-15.508 13.572,-24.685 8.741,-9.195 6.81,-12.009 6.52,-24.497 C 63.985,239.176 47.241,230.661 28.544,207.301 9.847,183.94 2.599,164.711 0.661,135.423 -1.277,106.135 0.403,87.154 13.057,62.843 25.711,38.532 39.034,26.829 62.122,14.69 85.21,2.553 107.832,-0.354 128.742,0 c 20.91,0.353 34.843,1.885 46.658,8.626 11.814,6.741 22.622,15.224 29.512,15.285 6.891,0.061 11.582,-1.744 14.931,-4.31 0.894,22.703 -19.539,24.675 -37.819,25.155 -18.281,0.479 -29.514,-7.083 -46.351,-4.27 -16.837,2.813 -44.404,10.475 -57.833,33.85 -13.429,23.375 -13.887,31.638 -12.771,51.24 1.116,19.603 17.988,34.228 27.512,34.387 9.523,0.159 11.649,-2.599 19.985,-8.036 8.337,-5.438 50.896,-58.122 65.418,-69.956 14.523,-11.834 28.854,-15.488 44.328,-15.678 15.474,-0.19 19.428,0.335 31.908,5.45 12.48,5.114 20.149,14.533 30.211,20.291 5.143,-3.027 8.338,-7.547 13.057,-10.996 16.877,-12.335 25.646,-15.659 45.705,-13.707 11.529,1.122 26.066,7.708 34.74,15.25 15.445,13.429 28.205,32.125 38.516,46.328 8.029,11.061 17.477,24.295 30.965,28.432 14.727,4.515 25.809,-14.559 27.436,-25.139 0.922,-5.995 2.125,-11.249 2.135,-17.847 0.01,-6.599 -0.664,-14.607 -2.566,-21.484 -1.902,-6.877 -5.16,-13.72 -8.688,-19.394 -5.742,-9.235 -15.137,-18.899 -24.912,-23.871 -5.486,-2.79 -18.393,-7.863 -26.529,-8.041 -9.969,-0.216 -17.564,3.133 -26.781,3.761 -11.156,0.761 -31.084,3.269 -39.83,-5.35 -5.566,-5.485 -6.266,-9.144 -7.217,-16.296 2.459,2.026 5.898,3.358 8.959,3.617 6.986,0.59 13.527,-5.114 19.166,-8.419 4.645,-2.723 11.223,-7.589 17.324,-10.048 15.676,-6.32 34.932,-6.138 51.48,-4.445 13.264,1.356 30.461,7.257 42.094,13.84 11.688,6.612 22.951,17.761 31.201,28.271 10.379,13.224 16.053,24.57 19.812,41.063 4.805,21.062 6.137,52.702 0.328,73.469 -4.578,16.365 -19.779,41.504 -32.719,53.827 -12.762,12.155 -27.498,18.022 -44.256,21.231 0.656,3.382 0.764,6.536 1.631,9.309 1.232,3.936 3.588,8.324 8.428,6.936 1.93,-0.553 2.963,-1.032 5.508,1.194 2.543,2.226 1.219,10.825 -5.938,14.684 -3.629,1.957 -7.459,2.382 -13.271,2.498 -5.812,0.116 -14.883,0.141 -21.193,-0.964 -6.309,-1.104 -10.078,-6.111 -17.066,-6.895 -10.799,-1.208 -19.068,-9.01 -27.727,-14.59 -3.613,-2.329 -4.832,-2.353 -6.914,-3.53 1.125,3.444 2.625,7.021 3.373,10.332 0.75,3.311 0.43,6.378 0.828,9.028 0.396,2.648 1.131,4.707 1.559,6.855 1.73,1.547 2.283,3.9 5.189,4.64 2.908,0.739 7.461,-0.412 10.436,-0.812 2.975,-0.4 4.969,-2.021 7.303,-1.577 2.336,0.443 4.549,2.115 6.506,3.682 1.957,1.567 3.639,1.796 5.223,5.706 1.584,3.91 3.037,11.917 3.254,17.269 0.217,5.352 -0.383,10.183 -1.969,14.43 -1.586,4.247 -2.98,6.13 -7.275,10.336 -4.295,4.207 -11.289,10.38 -18.268,14.68 1.285,1.903 1.855,3.645 3.859,5.71 2.004,2.066 6.182,4.381 8.041,6.56 1.857,2.179 2.799,3.742 2.826,6.186 0.029,2.443 -0.09,5.619 -2.074,8.283 -4.941,6.633 -10.785,7.821 -17.891,10.941 1.195,7.462 2.17,12.793 0.443,20.244 -0.705,3.036 -2.271,9.92 -6.016,11.686 -3.746,1.766 -10.969,0.911 -15.541,1.637 -4.572,0.727 -7.131,1.417 -10.695,2.125 -2.166,3.131 -5.391,6.586 -6.496,9.392 -1.107,2.807 -0.773,3.813 0.156,6.679 0.929,2.866 4.092,7.039 4.988,10.395 0.896,3.356 1.07,6.969 0.234,10.334 -0.838,3.365 -2.271,5.807 -5.139,8.795 -2.867,2.989 -8.508,5.336 -11.318,7.758 -2.812,2.423 -5.611,2.714 -4.844,6.723 1.055,5.506 9.1,14.436 14.92,16.562 3.488,1.275 8.17,0.873 12.406,-0.915 -0.287,4.703 -4.357,7.873 -7.016,10.996 7.201,-2.059 14.184,-6.001 19.014,-11.226 -1.498,4.538 -6.652,11.823 -14.361,18.22 -7.709,6.397 -7.662,5.088 -11.494,7.633 6.992,1.405 13.494,1.025 18.91,0.052 -2.969,1.637 -7.836,3.939 -14.283,4.616 -6.447,0.676 -10.422,0.198 -16.232,-1.213 -5.811,-1.412 -11.115,-6.694 -18.156,-10.335 0.686,2.612 1.174,5.753 4.135,8.439 2.961,2.686 7.441,4.052 12.203,6.375 -6.062,-0.688 -12.432,-0.896 -18.389,-2.209 -4.41,-0.973 -7.373,-2.005 -10.6,-3.603 -3.225,-1.598 -5.715,-3.929 -8.572,-5.893 1.369,2.615 1.775,5.691 4.105,7.847 2.33,2.156 6.117,2.959 9.18,4.44 -3.195,-0.07 -6.268,0.623 -9.58,-0.21 -3.314,-0.833 -6.422,-2.142 -9.867,-4.68 -3.445,-2.538 -6.998,-5.663 -9.938,-8.858 -2.938,-3.195 -6.566,-7.337 -7.664,-10.283 -1.1,-2.947 0.66,-5.008 0.99,-7.509 -2.029,1.333 -4.525,2.067 -6.084,4.002 -1.559,1.935 -2.941,3.702 -2.251,7.075 0.691,3.373 3.804,7.496 6.005,11.248 -6.568,-5.371 -10.236,-7.439 -11.799,-13.918 -1.463,-6.066 2.322,-11.572 5.199,-16.159 1.429,-2.278 3.567,-4.398 4.903,-6.597 -2.967,-2.903 -6.358,-5.398 -8.901,-8.709 -2.542,-3.31 -3.61,-7.79 -6.205,-10.957 -2.596,-3.168 -6.088,-5.173 -9.129,-7.756 2.673,5.742 7.066,12.785 8.02,17.229 0.953,4.444 -1.069,7.164 -2.646,9.563 -1.578,2.399 -4.124,2.934 -6.539,4.408 -2.415,1.475 -6.171,0.312 -7.61,2.501 -1.438,2.188 -1.824,5.48 -0.449,7.648 l 5.64,8.902 c -2.078,-1.049 -5.658,-4.1 -7.272,-6.264 -1.614,-2.164 -4.09,-4.163 -4.429,-7.089 -0.339,-2.925 -0.504,-5.464 1.391,-8.07 1.896,-2.605 7.086,-3.477 9.409,-5.48 2.323,-2.003 3.626,-3.307 3.493,-5.896 -0.132,-2.589 -2.661,-4.441 -4.835,-6.073 -6.637,-4.978 -15.151,-9.565 -20.787,-15.565 -3.184,-3.39 -4.712,-6.127 -5.352,-8.466 -0.639,-2.338 0.037,-4.162 1.619,-7.038 1.582,-2.877 7.007,-6.718 7.667,-9.843 0.659,-3.124 -2.081,-3.795 -4.554,-4.897 -2.473,-1.102 -7.17,0.565 -9.464,-1.352 -2.293,-1.917 0.674,-5.945 -1.911,-8.154 -2.584,-2.209 -8.499,-0.976 -11.552,-3.352 -3.053,-2.377 -4.315,-5.327 -5.367,-8.775 -1.052,-3.448 -1.171,-7.225 -0.458,-9.722 0.713,-2.497 2.855,-2.934 4.147,-4.228 1.292,-1.294 2.413,-2.367 0.691,-4.297 -1.722,-1.929 -7.365,0.108 -10.609,-2.369 -3.244,-2.477 -1.258,-8.41 -3.552,-10.911 -2.293,-2.501 -6.409,-1.522 -8.581,-2.321 -2.171,-0.799 -3.023,2.02 -4.355,-2.438 -1.332,-4.459 -1.368,-17.75 -3.16,-22.71 -1.792,-4.96 -5.311,-0.335 -6.945,-5.265 -1.634,-4.929 -0.085,-12.812 -0.821,-20.257 l -3.335,-20.257 c -11.634,7.815 -19.314,10.269 -31.813,12.477 -1.043,30.582 -3.916,48.591 6.464,82.52 10.38,33.928 31.387,53.924 59.726,82.649 -37.395,-28.016 -55.248,-50.792 -66.422,-79.97 -11.176,-29.182 -9.03,-53.586 -7.906,-81.686 z M 311.701,292.08 c 2.877,0.129 6.373,0.859 8.393,2.171 2.021,1.312 4.166,2.384 6,4.251 4.576,4.66 8.008,10.28 9.525,16.738 0.967,4.117 1.111,9.397 1.463,14.231 -1.385,-4.468 -2.316,-9.127 -4.289,-13.13 -3.111,-6.312 -8.396,-12.473 -14.959,-15.31 -2.166,-0.938 -3.611,-0.764 -4.803,-0.598 0.533,0.895 1.426,1.645 1.465,2.956 0.039,1.311 -0.254,3.876 -2.477,4.954 -3.584,1.739 -7.568,0.516 -10.336,-1.931 -2.791,-2.466 -3.742,-6.638 -2.281,-10.223 1.741,-4.272 8.375,-4.283 12.299,-4.109 z M 275.629,286 c 0.361,-7.345 3.012,-13.539 9.594,-17.141 3.404,-1.862 8.648,-4.27 13.467,-4.836 4.629,-0.543 15.889,-0.146 22.662,2.945 5.201,2.374 8.744,6.07 13.311,8.771 4.566,2.702 7.814,4.513 12.162,7.543 6.674,4.651 10.586,9.772 15.213,12.842 2.225,1.475 5.355,1.256 8.309,2.158 -2.297,0.682 -5.299,1.434 -7.777,0.642 -3.09,-0.988 -7.41,-3.813 -9.807,-5.838 -4.236,-3.578 -6.432,-5.324 -11.055,-8.023 -2.76,-1.608 -7.305,-3.503 -10.338,-5.481 -3.035,-1.978 -8.303,-6.318 -11.219,-7.787 -3.707,-1.866 -10.381,-2.904 -14.508,-2.783 -5.686,0.166 -13.916,1.104 -18.316,5.096 -4.371,3.968 -6.031,7.459 -5.045,12.612 1.646,-1.896 2.742,-4.278 4.391,-5.688 3.416,-2.918 7.336,-3.059 11.588,-2.506 4.777,0.622 7.182,3.381 8.76,7.916 -1.062,-0.78 -3.014,-2.493 -4.555,-3.024 -3.617,-1.248 -6.352,-0.864 -9.74,0.953 -4,2.146 -2.912,5.322 -3.488,8.854 -0.264,1.629 -0.879,2.941 -1.318,4.412 -1.504,-0.398 -2.895,-1.024 -4.033,-2.152 0.047,1.65 -0.193,3.093 0.145,4.949 0.336,1.855 1.24,4.059 1.859,6.088 -2.785,-2.786 -5.635,-5.38 -7.434,-8.977 -1.801,-3.599 -3.021,-7.593 -2.828,-11.545 z m 4.82,-53.46 c 2.053,-3.047 2.654,-7.721 3.92,-11.521 -0.506,4.813 0.467,10.106 -1.883,13.592 -2.35,3.486 -6.477,2.875 -9.896,3.889 2.66,-2.028 5.805,-2.913 7.859,-5.96 z m -49.151,71.368 c 2.636,-2.134 9.75,-0.428 15.071,-0.047 -3.824,0.979 -7.648,1.959 -11.472,2.938 -0.356,1.301 -0.195,2.792 -1.068,3.901 -0.874,1.11 -2.534,1.521 -3.8,2.28 0.125,-3.418 -1.367,-6.939 1.269,-9.072 z m 37.491,-148.22 c 3.176,1.71 7.207,3.971 10.012,4.041 2.805,0.07 3.539,-1.834 5.189,-2.933 2.596,8.465 5.576,17.766 9.996,25.447 1.852,3.218 3.033,1.722 4.441,4.956 1.406,3.233 2.031,9.812 3.365,13.943 1.336,4.131 3.078,7.171 4.617,10.756 -3.908,-5.537 -8.957,-12.597 -11.135,-17.205 -2.176,-4.607 -0.783,-5.008 -2.545,-9.396 -1.762,-4.388 -5.324,-11.228 -7.986,-16.842 -1.906,0.253 -4.266,0.6 -5.715,0.153 -1.449,-0.447 -1.16,-1.988 -2.469,-2.984 -1.311,-0.996 -3.514,-0.61 -5.35,-2.2 -1.836,-1.589 -2.254,-4.85 -2.42,-7.736 z m -17.101,41.769 c 2.989,-0.262 6.701,0.539 9.5,0.38 2.799,-0.159 4.797,-0.885 7.196,-1.328 -0.445,-4.216 -0.023,-11.962 -3.915,-14.777 -2.514,-1.818 -12.839,-0.449 -15.597,0.146 -6.206,1.338 -13.433,5.042 -19.435,7.358 5.752,-4.018 10.721,-7.742 17.62,-9.816 4.147,-1.247 13.825,-2.868 18.105,-1.712 1.954,0.527 2.349,1.336 3.534,2.992 4.074,5.688 4.062,10.604 5.119,17.23 1.039,1.619 2.146,2.699 2.988,4.369 0.84,1.67 1.316,4.298 1.551,6.446 -1.066,-1.546 -0.414,-3.485 -3.367,-4.636 -2.955,-1.151 -7.479,-0.076 -11.46,0.34 2.902,2.094 4.344,4.111 4.455,8.538 0.13,5.198 -4.271,8.939 -8.866,9.295 -6.379,0.495 -9.668,-0.906 -12.248,-6.358 -1.13,-2.388 -0.311,-5.261 -0.405,-7.589 -7.665,0.533 -7.54,0.283 -13.142,4.954 3.045,4.461 4.963,7.026 9.995,9.695 2.822,1.498 6.017,2.954 9.514,3.549 3.498,0.595 9.235,1.17 12.909,0.606 3.675,-0.564 5.757,-1.613 8.481,-4.132 2.725,-2.52 2.975,-6.128 4.039,-8.98 -0.242,2.745 -0.557,6.241 -1.576,8.232 -3.1,6.053 -8.461,7.847 -14.862,7.867 -6.144,0.02 -13.744,-1.397 -19.46,-3.767 -4.57,-1.894 -12.146,-7.258 -13.944,-11.918 -1.229,-3.184 -0.256,-7.091 -0.385,-10.637 6.328,-4.208 7.894,-3.173 15.381,-4.405 3.132,-0.516 5.286,-1.679 8.275,-1.942 z m -36.861,-28.501 c 0.178,-2.521 0.457,-2.467 0.686,-3.701 -5.765,-1.542 -8.077,2.198 -11.457,9.144 -1.265,2.599 -0.013,4.146 -1.37,5.857 -1.355,1.711 -3.539,1.471 -5.74,3.114 -2.201,1.642 -4.382,4.787 -6.44,6.488 -4.223,3.491 -9.931,5.622 -14.829,7.971 3.345,-2.468 9.836,-6.211 11.936,-9.797 1.114,-1.901 0.949,-5.486 2.683,-7.195 1.733,-1.71 2.34,-2.893 4.578,-3.329 2.238,-0.436 1.338,-3.03 2.06,-5.092 0.722,-2.062 2.16,-3.526 3.69,-5.586 1.53,-2.06 3.46,-5.153 6.481,-6.276 3.021,-1.124 7.732,0.091 10.019,-0.556 2.286,-0.647 0.973,-2.309 2.634,-3.307 1.663,-0.998 4.896,-0.558 7.117,-1.625 3.937,-1.893 5.82,-5.053 8.188,-8.436 0.344,7.282 0.26,12.525 -2.357,19.376 -2.947,7.711 -5.934,12.253 -14.298,16.995 -2.882,1.633 -5.75,2.2 -8.139,3.057 1.393,-1.9 3.387,-2.725 4.18,-5.7 0.791,-2.977 0.2,-8.88 0.378,-11.402 z m 135.038,35.507 c -3.977,0.259 -4.92,-0.264 -8.102,1.98 1.725,2.684 3.449,5.368 5.172,8.052 -0.152,-5.298 0.364,-6.36 2.93,-10.032 z m -10.42,-3.85 c 5.508,-2.346 10.307,-4.244 16.299,-4.619 2.402,-0.151 6.131,0.221 8.557,0.331 2.066,-3.042 4.699,-5.441 5.664,-8.913 0.639,-2.303 0.324,-12.992 -0.807,-15.767 -3.295,-8.076 -6.498,-8.417 -11.033,-13.043 -3.291,-3.355 -3.422,-8.464 -4.406,-14.189 -0.361,-2.103 -1.393,-4.764 -1.877,-6.934 -5.928,-0.999 -12.303,-1.328 -19.123,-0.987 3.307,-3.172 6.504,-6.07 7.453,-10.832 0.947,-4.762 0.176,-10.617 -2.531,-14.887 -2.707,-4.27 -7.031,-7.99 -11,-11.469 -3.971,-3.479 -9.662,-6.351 -13.424,-9.197 4.893,-1.752 9.889,-4.326 14.682,-5.255 12.486,-2.422 23.244,1.282 35.287,8.563 7.002,4.235 12.793,8.258 20.113,15.921 7.318,7.662 16.395,21.717 23.48,30.052 7.085,8.335 12.805,14.927 18.986,19.898 6.182,4.972 11.777,6.388 17.664,9.581 l 9.176,9.744 7.426,-9.189 11.949,1.351 2.469,-13.412 10.967,-3.005 -1.789,-18.08 7.885,-5.596 -5.926,-11.249 6.021,-12.292 -7.85,-14.051 3.027,-13.529 -9.088,-7.745 -1.186,-14.377 -12.678,-4.836 -5.086,-12.508 -14.254,-0.16 -6.992,-9.285 -9.596,0.672 -10.697,-1.165 -6.049,-4.466 -8.779,5.828 -10.623,-5.539 -21.117,8.017 13.766,-11.972 14.262,-2.278 10.926,-2.785 14.756,4.846 12.988,-3.29 12.523,7.403 13.252,-0.733 6.51,11.681 13.195,1.523 7.139,12.987 8.299,4.531 2.203,16.637 7.391,7.01 -3.25,14.557 8.707,11.024 -8.164,11.812 8.73,7.383 -11.16,9.891 11.303,11.771 -13.65,4.402 8.891,12.625 -11.15,1.924 7.312,13.882 -12.566,-0.167 6.33,10.398 -13.783,-1.659 3.297,14.959 -10.416,-9.163 -3.568,18.13 -7.188,-13.018 -3.893,16.237 -8.873,-11.973 0.242,17.026 -9.807,-15.309 c 2.068,8.686 1.654,18.197 7.359,26.386 17.676,-2.392 29.229,-6.846 42.771,-19.877 12.334,-11.868 27.076,-36.613 31.068,-52.308 4.555,-17.91 4.695,-50.85 0.209,-69.084 C 522.282,71.848 516.67,63.462 506.643,49.136 497.059,38.957 487.633,28.204 475.469,20.945 457.613,10.29 434.717,7.417 414.367,7.694 c -11.268,0.154 -18.816,2.318 -25.553,4.768 -11.781,4.284 -21.203,13.629 -33.18,18.247 -3.906,1.505 -7.037,1.552 -10.113,-0.091 3.012,6.026 6.289,8.729 13.801,10.922 5.434,1.586 18.4,0.583 27.326,-0.241 9.582,-0.885 14.58,-3.734 27.621,-3.555 12.736,0.175 22.828,5.013 28.346,8.168 11.385,6.51 19.549,13.732 26.643,25.172 3.896,6.282 6.625,13.37 8.547,20.603 1.922,7.233 2.764,15.334 2.887,22.415 0.123,7.081 -0.418,13.402 -2.15,19.774 -4.051,14.918 -12.988,30.098 -31.346,27.753 -11.234,-1.436 -28.17,-22.522 -33.842,-30.258 C 401.909,115.758 390.133,98.481 375.752,85.479 366.984,77.554 354.979,72.1 343.19,71.021 c -22.117,-2.024 -28.676,2.177 -45.324,15.899 3.387,1.08 6.693,1.676 10.164,3.24 7.703,3.471 14.748,7.957 20.893,13.711 6.439,6.031 9.328,9.848 9.557,18.484 0.152,5.735 -4.566,10.333 -8.891,14.469 -2.646,2.533 -6.148,4.852 -8.291,6.818 -2.84,2.609 -6.357,5.463 -2.789,9.619 1.342,1.562 3.672,2.74 5.637,4.199 3.119,2.315 1.691,10.919 -2.418,13.201 -5.258,2.917 -11.541,2.591 -15.877,-1.314 5.473,-0.819 8.949,-1.545 8.807,-6.022 -0.082,-2.595 -3.381,-4.751 -6.619,-6.227 -7.809,-3.56 -13.707,-3.035 -21.479,-8.627 -7.85,-5.651 -8.023,-8.745 -10.145,-17.617 -3.785,0.396 -7.27,0.483 -12.331,2.159 -5.061,1.675 -10.654,5.663 -15.249,6.65 -11.572,2.49 -13.878,1.752 -20.211,0.113 -11.15,-2.886 -25.668,2.055 -40.09,6.668 -2.398,0.767 -12.097,0.026 -18.626,2.317 -10.084,3.538 -24.233,12.106 -32.405,18.988 -12.382,10.429 -28.654,41.64 -37.848,77.464 -0.966,10.89 2.131,18.227 -4.729,23.546 -6.86,5.319 -6.67,18.946 -8.996,22.768 -2.326,3.821 -5.019,2.132 -10.026,7.499 -5.007,5.367 -7.556,4.47 -7.43,14.618 4.315,-2.837 10.606,-6.135 16.13,-6.334 4.892,-0.177 4.944,6.264 17.5,-6.149 6.715,-6.641 19.616,-6.844 28.567,-9.773 8.952,-2.929 25.083,-8.965 41.239,-27.027 16.156,-18.062 23.887,-37.077 27.02,-64.567 0.499,4.874 1.365,10.371 -0.722,23.816 -2.087,13.445 -6.585,28.546 2.891,46.634 l 5.904,11.269 c -3.515,-4.797 -10.381,-12.622 -12.448,-18.198 l -4.768,-12.863 c -10.667,16.748 -13.119,19.744 -27.937,31.743 -0.59,7.444 -0.735,15.208 1.698,22.331 2.433,7.122 -1.445,15.332 0.406,20.023 1.851,4.691 6.132,2.021 7.53,6.77 1.398,4.749 -0.73,14.138 1.438,18.767 2.168,4.629 7.487,1.82 10.065,3.315 2.578,1.496 3.421,3.546 4.8,5.513 1.378,1.966 -0.539,6.614 2.265,8.123 2.803,1.51 7.176,0.231 10.093,1.68 2.917,1.449 3.36,4.932 2.661,8.053 -0.7,3.121 -3.817,4.553 -5.186,7.726 -1.368,3.174 -1.215,5.383 0.429,8.297 1.644,2.915 5.284,4.52 8.912,5.991 3.628,1.471 8.726,0.645 12.47,2.679 3.744,2.034 7.109,6.087 9.086,9.033 1.977,2.945 2.526,5.023 2.425,8.12 -0.102,3.096 -1.358,6.663 -3.011,9.654 -1.653,2.991 -5.3,6.631 0.394,12.343 5.694,5.711 5.484,3.249 8.746,6.954 -0.355,-6.409 -3.003,-11.63 -1.067,-16.455 1.937,-4.825 7.752,-5.664 10.817,-7.834 3.065,-2.171 4.83,-5.153 7.246,-7.729 -0.035,3.315 0.32,6.879 -0.057,9.375 -0.768,5.075 -2.266,9.58 5.297,10.394 3.407,0.366 6.642,-1.843 10.227,-3.169 -1.878,3.363 -5.144,6.067 -5.635,10.092 -0.491,4.023 0.099,8.443 2.885,12.436 2.787,3.991 7.599,6.955 11.125,9.301 3.525,2.347 5.414,2.535 8.123,3.804 0.133,3.956 -0.646,8.143 -0.195,11.869 0.451,3.726 1.625,7.024 3.779,10.104 2.156,3.081 5.613,4.848 8.869,7.126 -1.785,-4.157 -5.406,-8.101 -5.357,-12.471 0.049,-4.369 1.359,-7.466 5.621,-11.343 4.262,-3.878 14.24,-7.241 18.945,-11.011 4.705,-3.771 6.223,-6.081 7.912,-9.742 1.689,-3.661 1.219,-9.559 1.531,-12.85 1.549,4.61 1.77,6.043 2.273,10.866 0.506,4.824 -2.811,11.59 -4.215,15.161 5.82,-2.811 9.514,-7.304 11.379,-11.695 1.248,0.74 0.619,2.769 1.078,6.679 2.074,-2.064 4.432,-3.652 6.52,-5.6 2.09,-1.946 4.379,-3.658 5.416,-6.375 1.035,-2.717 0.611,-5.606 -0.16,-8.763 -0.771,-3.157 -4.299,-6.818 -6.199,-10.271 -1.898,-3.452 0.336,-6.841 0.207,-11.001 -3.801,-0.653 -7.029,-2.589 -11.398,-1.96 -4.371,0.628 -9.377,5.533 -13.844,5.59 -4.467,0.057 -6.975,-4.128 -10.637,-5.278 -3.662,-1.15 -7.367,-1.024 -11.049,-1.536 4.664,-4.468 22.766,-6.596 35.148,-8.615 10.895,-1.777 21.707,-2.804 32.746,-2.959 4.93,-0.07 11.266,1.558 14.689,0.574 3.426,-0.982 2.695,-3.315 3.711,-5.858 2.842,-7.108 1.441,-13.438 -0.105,-20.596 -9.91,-1.162 -20.236,-2.584 -30.221,-1.817 -9.762,0.75 -21.322,5.391 -31.391,5.705 -8.754,0.272 -21.717,-1.677 -29.234,-6.259 -9.186,-5.599 -16.293,-17.624 -18.816,-21.485 -4.109,-6.289 -9.292,-18.627 -12.446,-24.268 -3.152,-5.641 -3.847,-7.219 -6.47,-9.574 -2.623,-2.354 -6.216,-2.536 -9.323,-3.805 3.582,0.366 7.493,-0.768 10.747,1.098 4.889,2.805 10.361,14.431 13.403,19.49 3.223,-10.804 2.471,-15.052 11.797,-21.144 -7.516,8.424 -7.703,14.805 -9.535,24.723 6.25,10.258 14.939,26.598 26.309,31.132 4.107,1.639 11.16,2.667 15.6,3.216 13.818,1.711 27.146,-2.668 40.717,-6.019 9.92,-2.45 19.986,-1.463 32.051,-0.754 4.096,0.24 13.754,-2.224 15.754,-6.367 1.08,-2.235 1,-4.921 -0.551,-7.303 -1.553,-2.382 -5.689,-3.534 -7.906,-5.678 -2.217,-2.144 -3.492,-4.689 -5.238,-7.034 -9.215,1.768 -16.795,2.447 -23.635,2.633 4.906,-2.021 9.613,-3.174 14.719,-5.171 5.106,-1.997 10.904,-5.275 15.025,-7.995 4.121,-2.721 6.752,-4.299 9.734,-7.465 2.98,-3.168 6.803,-6.431 9,-10.303 2.199,-3.872 2.539,-8.203 2.662,-12.995 0.123,-4.791 -0.084,-11.514 -1.932,-15.374 -1.846,-3.859 -5.406,-5.03 -8.266,-5.943 -2.861,-0.913 -4.82,1.396 -7.795,1.708 -2.977,0.312 -5.758,2.188 -10.062,0.164 -4.304,-2.024 -9.406,-6.144 -13.758,-12.259 -4.35,-6.116 -7.461,-16.112 -11.896,-23.802 -7.645,-13.256 -17.172,-25.639 -26.283,-37.922 -0.75,-3.029 -1.877,-7.215 -2.252,-11.324 -0.654,-7.16 -0.777,-14.598 1.445,-21.578 1.703,-5.347 4.18,-10.995 9.779,-13.188 2.24,-0.878 5.074,-1.226 7.076,-0.484 2.004,0.741 3.969,3.002 3.182,5.614 -0.865,2.872 -2.855,2.95 -4.207,4.4 -2.295,2.46 -3.213,4.265 -4.08,7.332 2.48,-0.04 5.832,-0.229 7.869,0.307 2.658,0.7 5.133,2.462 6.482,6.228 -3.172,-2.813 -4.748,-4.104 -8.707,-4.204 -1.814,-0.045 -4.018,0.604 -6.025,0.906 -0.75,2.44 -1.191,5.432 -2.25,7.32 -1.059,1.888 -3.121,1.435 -3.895,3.641 -0.774,2.202 -0.819,5.788 -0.429,8.683 z m 27.715,-3.307 c 1.215,0.479 1.678,0.584 3.217,1.755 1.539,1.171 3.662,2.34 4.881,5.138 1.221,2.799 1.164,7.127 0.904,8.89 -1.07,-0.314 -2.529,-0.102 -3.639,-1.051 -1.107,-0.949 -1.768,-3.098 -3.188,-4.018 -1.422,-0.919 -2.607,-0.718 -4.178,-0.917 0.807,2.296 1.199,4.593 0.824,6.675 -0.814,4.545 -3.486,6.847 -7.812,7.391 -1.889,0.237 -4.889,-0.385 -6.533,-0.684 0.762,1.702 2.053,3.193 2.816,4.895 3.658,-0.529 6.369,-0.454 8.336,-1.374 1.967,-0.92 4.076,-2.981 6.6,-3.854 2.525,-0.873 4.777,-0.859 7.539,-1.29 -2.176,1.875 -3.604,3.751 -5.777,5.626 1.594,4.633 3.188,9.265 4.781,13.897 3.379,2.114 6.549,3.228 10.807,5.838 4.26,2.611 9.367,7.281 14.914,9.828 5.547,2.547 8.85,3.933 14.646,5.026 5.795,1.093 10.406,5.787 16.109,6.55 5.703,0.763 16.355,0.917 20.75,0.488 4.99,-0.487 11.473,-3.062 12.055,-8.533 -4.184,1.032 -10.574,0.106 -13.801,-7.767 -1.432,-3.496 -0.73,-9.925 -2.922,-14.059 -2.191,-4.135 -5.246,-5.462 -8.896,-10.556 -3.65,-5.094 -9.621,-13.129 -12.973,-19.954 -3.35,-6.824 -4.139,-14.554 -6.973,-20.669 -2.834,-6.114 -7.109,-11.053 -10.422,-15.766 -7.234,-10.3 -13.068,-17.339 -24.986,-22.535 -5.732,-2.499 -12.258,-3.165 -18.387,-4.748 -2.494,1.117 -5.914,2.351 -6.521,5.268 -0.607,2.917 0.559,7.225 2.676,9.415 3.543,3.661 8.793,7.618 10.857,13.437 1.326,3.734 1.711,16.252 0.562,19.649 -1.192,3.527 -3.963,5.66 -6.266,8.009 z m 1.154,29.629 c -1.107,0.955 -1.951,1.936 -3.732,2.729 -1.779,0.793 -4.209,0.998 -6.57,1.588 3.311,5.154 6.789,10.362 9.961,15.781 3.174,5.418 5.924,11.351 8.953,17.025 -0.143,-3.252 0.049,-6.719 -0.424,-9.758 -0.473,-3.038 -1.85,-5.697 -3.215,-10.258 -1.363,-4.561 -3.041,-10.766 -4.973,-17.107 z M 279.229,113.611 c -0.467,5.07 0.391,12.996 1.441,17.96 1.258,5.942 2.469,9.023 7.291,12.603 8.83,6.555 14.467,5.45 21.26,9.251 3.232,1.809 7.328,4.841 8.523,8.046 1.195,3.205 -0.789,6.685 -3.24,8.053 4.287,0.638 9.094,-4.195 7.088,-9.157 -0.988,-2.442 -5.691,-3.53 -7.133,-5.994 -1.439,-2.463 -1.436,-4.999 -0.758,-7.501 1.225,-4.51 10.148,-8.608 13.301,-12.173 4.852,-5.486 6.715,-10.075 3.967,-17.14 -3.859,-9.925 -18.768,-17.889 -27.691,-21.784 -4.086,-1.783 -6.377,-1.91 -9.564,-2.865 6.525,3.824 13.404,6.87 16.705,15.418 2.756,7.139 0.369,9.829 0.461,16.045 0.043,2.882 3.838,4.323 5.523,6.144 1.467,1.583 1.348,2.758 0.176,4.943 -0.129,-1.971 -0.971,-3.442 -2.484,-4.513 -2.498,-1.771 -5.189,-1.39 -6.52,-5.021 -2.02,-5.52 1.986,-10.748 -2.518,-16.946 -3.369,-4.637 -7.85,-9.827 -13.895,-9.963 -2.861,-0.065 -5.012,0.367 -8.068,1.271 l -4.074,-4.903 -0.094,-0.064 C 270.639,87.758 264.969,81.525 253.344,76.327 241.719,71.13 235.99,70.343 222.661,70.639 c -13.329,0.295 -26.557,1.41 -41.995,14.723 -15.437,13.313 -55.224,64.292 -64.873,70.744 -9.648,6.452 -11.785,8.638 -23.841,8.641 C 79.896,164.75 61.08,147.697 60.343,126.385 59.605,105.072 59.309,97.497 74.124,71.822 88.94,46.146 115.78,38.262 135.694,35.6 c 19.915,-2.662 31.882,4.352 46.613,4.385 14.73,0.034 29.288,-2.509 33.581,-14.224 -2.101,1.251 -4.916,2.661 -12.832,2.246 C 195.14,27.592 184.164,18.427 171.817,12.286 159.47,6.146 145.73,5.427 128.107,5.094 110.484,4.761 88.494,6.108 66.708,17.869 44.922,29.63 30.051,42.109 17.415,65.127 4.779,88.146 2.891,106.94 4.928,134.811 c 2.037,27.871 10.633,48.599 27.184,68.998 16.551,20.399 33.092,30.38 62.918,34.091 l 6.279,-27.696 -11.209,16.086 0.277,-17.891 -10.139,12.581 -4.447,-17.062 -8.214,13.679 -4.08,-19.05 -11.903,9.627 3.768,-15.719 -15.75,1.743 7.235,-10.926 -14.361,0.175 L 40.842,168.86 28.1,166.837 38.26,153.57 22.66,148.945 35.576,136.577 22.823,126.184 32.798,118.426 23.47,106.014 33.42,94.431 29.706,79.135 38.155,71.77 40.67,54.289 50.152,49.527 58.31,35.881 73.389,34.28 l 7.44,-12.274 15.145,0.771 14.312,-7.779 14.843,3.457 16.86,-5.092 12.487,2.926 16.296,2.395 15.733,12.58 -24.133,-8.424 -12.14,5.821 -10.035,-6.125 -6.909,4.693 -12.225,1.224 -10.963,-0.708 -7.992,9.756 -16.291,0.168 -5.811,13.143 -14.486,5.082 -1.355,15.107 -10.388,8.138 3.461,14.216 -8.971,14.765 6.882,12.915 -6.773,11.82 9.011,5.88 -2.044,18.998 12.532,3.158 2.823,14.093 13.656,-1.419 8.484,9.656 10.486,-10.239 c 19.116,-9.532 26.988,-14.864 41.886,-30.977 16.959,-18.343 26.679,-35.302 49.269,-47.861 16.202,-9.008 29.417,-12.25 47.617,-9.105 17.088,2.952 22.81,13.202 35.395,24 1.334,-2.415 1.605,-3.055 3.803,-4.833 -0.69,3.136 -1.786,6.389 -2.065,9.405 z"
-             id="path2492"
-             inkscape:connector-curvature="0" />
-        </g>
-      </g>
-    </g>
-  </g>
-  <g
-     inkscape:label="gnu:net grunge"
-     id="g12308"
-     inkscape:groupmode="layer"
-     style="display:none"
-     transform="translate(-387.41463,-589.81931)">
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="478.95114"
-       y="859.00549"
-       id="text12220"><tspan
-         sodipodi:role="line"
-         id="tspan12218"
-         x="478.95114"
-         y="859.00549"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:36px;font-family:ReservoirGrunge;-inkscape-font-specification:ReservoirGrunge;fill:#ffffff;stroke-width:1.03365779px"
-         dx="0 2.5 2.5 0 -4 2.5 2.5">gnu net</tspan></text>
-  </g>
-  <g
-     transform="translate(-387.41463,-589.81931)"
-     style="display:none"
-     inkscape:groupmode="layer"
-     id="g5346"
-     inkscape:label="gnu:net ubuntu">
-    <text
-       id="text5344"
-       y="859.96057"
-       x="493.95291"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       xml:space="preserve"><tspan
-         dx="0 0 0"
-         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:49.33333206px;font-family:'Ubuntu Bold';-inkscape-font-specification:'Ubuntu Bold, ';fill:#ffffff;stroke-width:1.03365779px"
-         y="859.96057"
-         x="493.95291"
-         id="tspan5342"
-         sodipodi:role="line">gnu net</tspan></text>
-  </g>
-  <g
-     inkscape:label="gnu:net anonymous"
-     id="g950"
-     inkscape:groupmode="layer"
-     style="display:inline"
-     transform="translate(-387.41463,-589.81931)">
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:16.53852463px;line-height:125%;font-family:Ubuntu;-inkscape-font-specification:Ubuntu;letter-spacing:0px;word-spacing:0px;display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.03365779px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="507.95291"
-       y="858.71057"
-       id="text948"><tspan
-         sodipodi:role="line"
-         id="tspan946"
-         x="507.95291"
-         y="858.71057"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:50.66666794px;font-family:'Anonymous Pro';-inkscape-font-specification:'Anonymous Pro Bold';fill:#ffffff;stroke-width:1.03365779px"
-         dx="0 -2.5 -3 0 -19.25 -2.5 -3">gnu net</tspan></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer3"
-     inkscape:label="vertices 2"
-     style="display:inline"
-     transform="translate(0,-47.278107)"
-     sodipodi:insensitive="true">
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 51.98603,94.74526 63.6227,34.91188 23.31802,-11.09978 -35.03955,28.74946 11.86161,-17.77468 -53.18435,-5.79678 40.95076,23.69646 25.32406,0.49689 24.19305,3.02495 v 48.02104 l 21.04995,-32.14943 -20.559,-15.87161 32.52749,48.02104 -8.06937,31.38386 -24.94907,-31.76198 24.94907,77.51429 22.25436,-36.69889 21.97354,37.07701 -43.59987,-0.37188 41.32877,-28.87448 22.05899,-21.17152 -19.90986,50.171 -3.71591,-29.60613 -8.57843,-31.7682 -9.69437,24.71516 54.37611,-52.19866 -24.96716,8.94671 -18.39175,19.15282 18.27579,-55.07718 25.20812,27.362 20.66591,-41.35238 -46.00204,14.12783 22.94304,-37.07431 23.05297,23.0777 31.8814,-26.48075 40.07874,-25.58708 -15.26372,39.20869 -24.69305,-13.74039 -55.05634,4.03119 79.62738,9.58108 -56.57441,12.73416"
-       id="path9316"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccccccc" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 139.04572,118.81358 37.0456,48.02106"
-       id="path9318"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 128.46126,147.9287 10.96248,-29.11512 12.47454,32.51819"
-       id="path12058"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 252.31652,123.28236 54.69043,-3.64603 -31.75647,27.04795"
-       id="path12250"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="112.66669"
-       cx="83.343307"
-       id="ellipse12260"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="123.35095"
-       cx="63.064556"
-       id="ellipse12264"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12266"
-       cx="139.04277"
-       cy="118.93542" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       inkscape:transform-center-y="-10.724852"
-       inkscape:transform-center-x="9.5305947"
-       cy="123.78851"
-       cx="252.13518"
-       id="ellipse12292"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       inkscape:transform-center-y="-10.724835"
-       inkscape:transform-center-x="9.5305988"
-       cy="119.55022"
-       cx="307.26297"
-       id="ellipse12296"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <path
-       style="fill:none;stroke:#3498db;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97647059"
-       d="m 52.875,94.278107 10,29.000003 21,-10.5 v 0 0"
-       id="path5311"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#3498db;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97647059"
-       d="m 102.875,75.278107 -39.5,48.000003 v 0 l -1,2"
-       id="path5313"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;stroke:#3498db;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 229.75,196.02811 -44,2.625 25.375,17.125 v 0"
-       id="path5331"
-       inkscape:connector-curvature="0" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="vertices 0"
-     style="display:inline;opacity:1"
-     transform="translate(-387.41463,-589.81931)"
-     sodipodi:insensitive="true">
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 515.87589,689.71367 24.57107,51.42411"
-       id="path9320"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 574.46842,741.13778 12.85257,40.08057"
-       id="path9322"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 565.39603,772.52162 0.37803,45.75234"
-       id="path9324"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 642.13335,732.06293 -12.09653,36.6775"
-       id="path9326"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 515.87589,690.09178 46.98395,22.0278 10.85256,28.26194"
-       id="path12060"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 450.10106,666.64844 54.05634,6.0499"
-       id="path12214"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:#729fcf;fill-rule:evenodd;stroke:#3498db;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 641.75532,730.92859 -2.26809,-64.28015"
-       id="path12206"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 629.28078,768.36231 -12.85255,-66.17074 v 36.6775 z"
-       id="path12208"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 597.52742,757.77501 31.75336,10.5873"
-       id="path12210"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:1.58654225px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 540.44696,693.87298 v 48.77728 l 24.57105,30.2495 23.81505,9.45293"
-       id="path12212"
-       inkscape:connector-curvature="0" />
-    <path
-       style="display:inline;fill:none;fill-rule:evenodd;stroke:#3498db;stroke-width:3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="m 564.64001,819.03019 44.98392,-0.37812"
-       id="path12216"
-       inkscape:connector-curvature="0" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12252"
-       cx="587.39447"
-       cy="781.79773" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="818.74042"
-       cx="609.15759"
-       id="ellipse12254"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12256"
-       cx="565.97528"
-       cy="818.74042" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12262"
-       cx="490.92691"
-       cy="689.33545" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="690.09174"
-       cx="516.25397"
-       id="ellipse12268"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12270"
-       cx="561.66821"
-       cy="709.15314" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="671.6922"
-       cx="502.64844"
-       id="ellipse12272"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12274"
-       cx="540.81299"
-       cy="693.37305" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="741.13794"
-       cx="540.82501"
-       id="ellipse12276"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12278"
-       cx="573.51123"
-       cy="741.22632" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       cy="772.52173"
-       cx="565.39612"
-       id="ellipse12280"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12282"
-       cx="606.38373"
-       cy="789.62549"
-       inkscape:transform-center-x="9.5306006"
-       inkscape:transform-center-y="-10.72485" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       inkscape:transform-center-y="-10.724822"
-       inkscape:transform-center-x="9.5305654"
-       cy="730.17249"
-       cx="641.75543"
-       id="ellipse12284"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12286"
-       cx="616.8064"
-       cy="702.94794"
-       inkscape:transform-center-x="9.5305633"
-       inkscape:transform-center-y="-10.724851" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       inkscape:transform-center-y="-10.724843"
-       inkscape:transform-center-x="9.5305819"
-       cy="738.49109"
-       cx="617.18439"
-       id="ellipse12288"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12290"
-       cx="629.03088"
-       cy="768.17493"
-       inkscape:transform-center-x="9.5305949"
-       inkscape:transform-center-y="-10.724827" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12294"
-       cx="662.54626"
-       cy="688.95752"
-       inkscape:transform-center-x="9.5306048"
-       inkscape:transform-center-y="-10.724823" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12298"
-       cx="719.24872"
-       cy="675.72339"
-       inkscape:transform-center-x="9.5305824"
-       inkscape:transform-center-y="-10.724798" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12302"
-       cx="617.18439"
-       cy="738.49109"
-       inkscape:transform-center-x="9.5305819"
-       inkscape:transform-center-y="-10.724843" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       inkscape:transform-center-y="-10.724843"
-       inkscape:transform-center-x="9.5305819"
-       cy="738.49109"
-       cx="617.24689"
-       id="ellipse12304"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12306"
-       cx="598.0033"
-       cy="758.21582"
-       inkscape:transform-center-x="9.5306167"
-       inkscape:transform-center-y="-10.724797" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12258"
-       cx="440.27264"
-       cy="636.84271" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       inkscape:transform-center-y="-10.724829"
-       inkscape:transform-center-x="9.5306165"
-       cy="636.8053"
-       cx="734.7594"
-       id="ellipse12300"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12258-3"
-       cx="490.28964"
-       cy="617.81934" />
-    <ellipse
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12258-3-0"
-       cx="689.78961"
-       cy="617.81934" />
-    <path
-       style="display:inline;fill:none;fill-opacity:1;stroke:#3498db;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97647059"
-       d="m 439.28963,637.81931 50.5,-19.5 -14.05,28.1 0.925,-1.725 -5.875,11.75 -0.25,-0.75"
-       id="path5161"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       style="display:inline;fill:none;stroke:#3498db;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.97647059"
-       d="m 734.78963,636.81931 -40.285,-17.00922 -4.715,-1.99078 29,57.5 v -0.5 0 h 0.5 v 0"
-       id="path5163"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="no:des"
-     style="display:inline"
-     sodipodi:insensitive="true">
-    <ellipse
-       transform="translate(-387.41463,-589.81931)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12282-8-9-0"
-       cx="587.3924"
-       cy="855.64899"
-       inkscape:transform-center-x="9.5306006"
-       inkscape:transform-center-y="-10.72485" />
-    <ellipse
-       transform="translate(-387.41463,-589.81931)"
-       ry="4.1593032"
-       rx="4.1581793"
-       style="display:inline;opacity:1;fill:#3498db;fill-opacity:1;stroke:#3498db;stroke-width:0.39663559;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.97635139"
-       id="ellipse12282-8-9"
-       cx="587.3924"
-       cy="839.31183"
-       inkscape:transform-center-x="9.5306006"
-       inkscape:transform-center-y="-10.72485" />
-  </g>
-</svg>
diff --git a/contrib/ci/Containerfile b/contrib/ci/Containerfile
new file mode 100644
index 000000000..a69c35f7e
--- /dev/null
+++ b/contrib/ci/Containerfile
@@ -0,0 +1,45 @@
+FROM docker.io/library/debian:bookworm
+ENV DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -yqq && \
+    apt-get upgrade -yqq && \
+    apt-get install -yqq \
+                   git \
+                   autoconf \
+                   libextractor-dev \
+                   libjansson-dev \
+                   libgcrypt-dev \
+                   libqrencode-dev \
+                   libpq-dev \
+                   libmicrohttpd-dev \
+                   pkg-config \
+                   libtool \
+                   recutils \
+                   make \
+                   python3-sphinx \
+                   python3-sphinx-book-theme \
+                   python3-sphinx-multiversion \
+                   python3-sphinx-rtd-theme \
+                   texinfo \
+                   autopoint \
+                   curl \
+                   libcurl4-openssl-dev \
+                   libsodium-dev \
+                   libidn11-dev \
+                   zlib1g-dev \
+                   libunistring-dev \
+                   iptables
+# Debian packaging tools
+RUN apt-get install -yqq \
+                   po-debconf \
+                   build-essential \
+                   debhelper-compat \
+                   devscripts \
+                   git-buildpackage \
+   && rm -rf /var/lib/apt/lists/*
+WORKDIR /workdir
+CMD ["/bin/bash"]
diff --git a/contrib/ci/ci.sh b/contrib/ci/ci.sh
new file mode 100755
index 000000000..0719015b9
--- /dev/null
+++ b/contrib/ci/ci.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -exvuo pipefail
+# Requires podman
+# Fails if not found in PATH
+OCI_RUNTIME=$(which podman)
+REPO_NAME=$(basename "${PWD}")
+JOB_NAME="${1}"
+JOB_ARCH=$((grep CONTAINER_ARCH contrib/ci/jobs/${JOB_NAME}/config.ini | cut -d' ' -f 3) || echo "${2:-amd64}")
+JOB_CONTAINER=$((grep CONTAINER_NAME contrib/ci/jobs/${JOB_NAME}/config.ini | cut -d' ' -f 3) || echo "localhost/${REPO_NAME}:${JOB_ARCH}")
+CONTAINER_BUILD=$((grep CONTAINER_BUILD contrib/ci/jobs/${JOB_NAME}/config.ini | cut -d' ' -f 3) || echo "True")
+echo "Image name: ${JOB_CONTAINER}"
+if [ "${CONTAINER_BUILD}" = "True" ] ; then
+        "${OCI_RUNTIME}" build \
+                --arch "${JOB_ARCH}" \
+                -t "${JOB_CONTAINER}" \
+                -f contrib/ci/Containerfile .
+fi
+"${OCI_RUNTIME}" run \
+        --rm \
+        -ti \
+        --arch "${JOB_ARCH}" \
+        --env CI_COMMIT_REF="$(git rev-parse HEAD)" \
+        --volume "${PWD}":/workdir \
+        --workdir /workdir \
+        "${JOB_CONTAINER}" \
+        contrib/ci/jobs/"${JOB_NAME}"/job.sh
+top_dir=$(dirname "${BASH_SOURCE[0]}")
+#"${top_dir}"/build.sh
diff --git a/contrib/ci/docker/Dockerfile b/contrib/ci/docker/Dockerfile
deleted file mode 100644
index b9f019c43..000000000
--- a/contrib/ci/docker/Dockerfile
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM ubuntu:18.04
-# Install the required build tools
-RUN apt update && apt install -y apt git autopoint automake texinfo gettext autoconf libtool libidn11-dev libunistring-dev gnutls-dev libgcrypt20 libgcrypt20-dev libjansson-dev libsqlite3-dev wget flex bison libglib2.0-dev libgmp3-dev libmicrohttpd-dev libglpk-dev libextractor-dev
-# Install gnurl from source at version gnurl-7.54.0
-WORKDIR /usr/src
-RUN git clone https://git.taler.net/gnurl.git --branch gnurl-7.57.0
-RUN cd /usr/src/gnurl && autoreconf -i && ./configure --prefix=/usr --disable-ntlm-wb && make install
-# Install libpbc
-WORKDIR /usr/src
-RUN wget https://crypto.stanford.edu/pbc/files/pbc-0.5.14.tar.gz && tar xvzpf pbc-0.5.14.tar.gz && cd /usr/src/pbc-0.5.14 && ./configure --prefix=/usr && make install
-# Install libbswabe
-WORKDIR /usr/src
-RUN git clone https://github.com/schanzen/libgabe.git && cd /usr/src/libgabe && ./configure --prefix=/usr && make install
-WORKDIR /usr/src
-RUN git clone git://gnunet.org/gnunet.git
-RUN cd /usr/src/gnunet && ./bootstrap && ./configure --enable-experimental --prefix=/usr && make && make install
-RUN addgroup gnunetdns && addgroup gnunet && adduser --system --home /var/lib/gnunet gnunet
-RUN chown gnunet:gnunet /var/lib/gnunet
-RUN echo '[arm]\nSTART_SYSTEM_SERVICES = YES\nSTART_USER_SERVICES = NO\n' > /etc/gnunet.conf
-ADD docker-entrypoint.sh .
-RUN rm -rf /usr/src/*
-#RUN apt remove gcc
-CMD ["sh", "docker-entrypoint.sh"]
diff --git a/contrib/ci/docker/docker-entrypoint.sh b/contrib/ci/docker/docker-entrypoint.sh
deleted file mode 100644
index db916cce7..000000000
--- a/contrib/ci/docker/docker-entrypoint.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-gnunet-arm -s > $HOME/gnunet.log 2>&1
-exec bash
diff --git a/contrib/ci/jobs/0-build/build.sh b/contrib/ci/jobs/0-build/build.sh
new file mode 100755
index 000000000..a5a89ca82
--- /dev/null
+++ b/contrib/ci/jobs/0-build/build.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -exuo pipefail
+./bootstrap
+./configure CFLAGS="-ggdb -O0" \
+            --enable-logging=verbose \
+            --disable-doc
+make -j $(nproc)
+make install
diff --git a/contrib/ci/jobs/0-build/job.sh b/contrib/ci/jobs/0-build/job.sh
new file mode 100755
index 000000000..8d79902c5
--- /dev/null
+++ b/contrib/ci/jobs/0-build/job.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -exuo pipefail
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+"${job_dir}"/build.sh
diff --git a/contrib/ci/jobs/2-deb-package/job.sh b/contrib/ci/jobs/2-deb-package/job.sh
new file mode 100755
index 000000000..00ded9323
--- /dev/null
+++ b/contrib/ci/jobs/2-deb-package/job.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -exuo pipefail
+# This file is in the public domain.
+# Helper script to build the latest DEB packages in the container.
+unset LD_LIBRARY_PATH
+# Install build-time dependencies.
+# Update apt cache first
+apt-get update
+mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
+export VERSION="$(./contrib/ci/jobs/2-deb-package/version.sh)"
+echo "Building gnunet packages version ${VERSION}"
+EMAIL=none gbp dch --ignore-branch --debian-tag="%(version)s" --git-author --new-version="${VERSION}"
+./bootstrap
+dpkg-buildpackage -rfakeroot -b -uc -us
+ls -alh ../*.deb
+mkdir -p /artifacts/gnunet/${CI_COMMIT_REF} # Variable comes from CI environment
+mv ../*.deb /artifacts/gnunet/${CI_COMMIT_REF}/
diff --git a/contrib/ci/jobs/2-deb-package/version.sh b/contrib/ci/jobs/2-deb-package/version.sh
new file mode 100755
index 000000000..b12ca77ba
--- /dev/null
+++ b/contrib/ci/jobs/2-deb-package/version.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -ex
+BRANCH=$(git name-rev --name-only HEAD)
+if [ -z "${BRANCH}" ]; then
+        exit 1
+else
+        # "Unshallow" our checkout, but only our current branch, and exclude the submodules.
+        git fetch --no-recurse-submodules --tags --depth=1000 origin "${BRANCH}"
+        RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --exclude '*-*dev*' --always --abbrev=0 HEAD || exit 1)
+        commits="$(git rev-list ${RECENT_VERSION_TAG}..HEAD --count)"
+        if [ "${commits}" = "0" ]; then
+                git describe --tag HEAD | sed -r 's/^v//' || exit 1
+        else
+                echo $(echo ${RECENT_VERSION_TAG} | sed -r 's/^v//')-${commits}-$(git rev-parse --short=8 HEAD)
+        fi
+fi
diff --git a/contrib/ci/jobs/3-deploy-package/config.ini b/contrib/ci/jobs/3-deploy-package/config.ini
new file mode 100644
index 000000000..08c106f9c
--- /dev/null
+++ b/contrib/ci/jobs/3-deploy-package/config.ini
@@ -0,0 +1,6 @@
+[build]
+HALT_ON_FAILURE = True
+WARN_ON_FAILURE = True
+CONTAINER_BUILD = False
+CONTAINER_NAME = nixery.dev/shell/rsync
+CONTAINER_ARCH = amd64
diff --git a/contrib/ci/jobs/3-deploy-package/job.sh b/contrib/ci/jobs/3-deploy-package/job.sh
new file mode 100755
index 000000000..d53588a0f
--- /dev/null
+++ b/contrib/ci/jobs/3-deploy-package/job.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -exuo pipefail
+ARTIFACT_PATH="/artifacts/gnunet/${CI_COMMIT_REF}/*.deb"
+RSYNC_HOST="taler.host.internal"
+RSYNC_PORT=424242
+RSYNC_PATH="incoming_packages/bookworm-taler-ci/"
+RSYNC_DEST="rsync://${RSYNC_HOST}/${RSYNC_PATH}"
+rsync -vP \
+      --port ${RSYNC_PORT} \
+      ${ARTIFACT_PATH} ${RSYNC_DEST}
diff --git a/contrib/ci/jobs/4-arm64-build/build.sh b/contrib/ci/jobs/4-arm64-build/build.sh
new file mode 100755
index 000000000..7da9d4a75
--- /dev/null
+++ b/contrib/ci/jobs/4-arm64-build/build.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -exuo pipefail
+make clean
+./bootstrap
+./configure CFLAGS="-ggdb -O0" \
+            --enable-logging=verbose \
+            --disable-doc
+make -j $(nproc)
+make install
diff --git a/contrib/ci/jobs/4-arm64-build/config.ini b/contrib/ci/jobs/4-arm64-build/config.ini
new file mode 100644
index 000000000..b5b4b5fe7
--- /dev/null
+++ b/contrib/ci/jobs/4-arm64-build/config.ini
@@ -0,0 +1,6 @@
+[build]
+HALT_ON_FAILURE = True
+WARN_ON_FAILURE = True
+CONTAINER_BUILD = True
+CONTAINER_NAME = gnunet:arm64
+CONTAINER_ARCH = arm64
diff --git a/contrib/ci/jobs/4-arm64-build/job.sh b/contrib/ci/jobs/4-arm64-build/job.sh
new file mode 100755
index 000000000..8d79902c5
--- /dev/null
+++ b/contrib/ci/jobs/4-arm64-build/job.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -exuo pipefail
+job_dir=$(dirname "${BASH_SOURCE[0]}")
+"${job_dir}"/build.sh
diff --git a/contrib/ci/jobs/5-arm64-deb-package/config.ini b/contrib/ci/jobs/5-arm64-deb-package/config.ini
new file mode 100644
index 000000000..b5b4b5fe7
--- /dev/null
+++ b/contrib/ci/jobs/5-arm64-deb-package/config.ini
@@ -0,0 +1,6 @@
+[build]
+HALT_ON_FAILURE = True
+WARN_ON_FAILURE = True
+CONTAINER_BUILD = True
+CONTAINER_NAME = gnunet:arm64
+CONTAINER_ARCH = arm64
diff --git a/contrib/ci/jobs/5-arm64-deb-package/job.sh b/contrib/ci/jobs/5-arm64-deb-package/job.sh
new file mode 100755
index 000000000..00ded9323
--- /dev/null
+++ b/contrib/ci/jobs/5-arm64-deb-package/job.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -exuo pipefail
+# This file is in the public domain.
+# Helper script to build the latest DEB packages in the container.
+unset LD_LIBRARY_PATH
+# Install build-time dependencies.
+# Update apt cache first
+apt-get update
+mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
+export VERSION="$(./contrib/ci/jobs/2-deb-package/version.sh)"
+echo "Building gnunet packages version ${VERSION}"
+EMAIL=none gbp dch --ignore-branch --debian-tag="%(version)s" --git-author --new-version="${VERSION}"
+./bootstrap
+dpkg-buildpackage -rfakeroot -b -uc -us
+ls -alh ../*.deb
+mkdir -p /artifacts/gnunet/${CI_COMMIT_REF} # Variable comes from CI environment
+mv ../*.deb /artifacts/gnunet/${CI_COMMIT_REF}/
diff --git a/contrib/ci/jobs/5-arm64-deb-package/version.sh b/contrib/ci/jobs/5-arm64-deb-package/version.sh
new file mode 100755
index 000000000..b12ca77ba
--- /dev/null
+++ b/contrib/ci/jobs/5-arm64-deb-package/version.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+set -ex
+BRANCH=$(git name-rev --name-only HEAD)
+if [ -z "${BRANCH}" ]; then
+        exit 1
+else
+        # "Unshallow" our checkout, but only our current branch, and exclude the submodules.
+        git fetch --no-recurse-submodules --tags --depth=1000 origin "${BRANCH}"
+        RECENT_VERSION_TAG=$(git describe --tags --match 'v*.*.*' --exclude '*-*dev*' --always --abbrev=0 HEAD || exit 1)
+        commits="$(git rev-list ${RECENT_VERSION_TAG}..HEAD --count)"
+        if [ "${commits}" = "0" ]; then
+                git describe --tag HEAD | sed -r 's/^v//' || exit 1
+        else
+                echo $(echo ${RECENT_VERSION_TAG} | sed -r 's/^v//')-${commits}-$(git rev-parse --short=8 HEAD)
+        fi
+fi
diff --git a/contrib/ci/jobs/6-arm64-deploy-package/config.ini b/contrib/ci/jobs/6-arm64-deploy-package/config.ini
new file mode 100644
index 000000000..a8ad1c16d
--- /dev/null
+++ b/contrib/ci/jobs/6-arm64-deploy-package/config.ini
@@ -0,0 +1,6 @@
+[build]
+HALT_ON_FAILURE = True
+WARN_ON_FAILURE = True
+CONTAINER_BUILD = False
+CONTAINER_NAME = nixery.dev/shell/rsync
+CONTAINER_ARCH = arm64
diff --git a/contrib/ci/jobs/6-arm64-deploy-package/job.sh b/contrib/ci/jobs/6-arm64-deploy-package/job.sh
new file mode 100755
index 000000000..d53588a0f
--- /dev/null
+++ b/contrib/ci/jobs/6-arm64-deploy-package/job.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -exuo pipefail
+ARTIFACT_PATH="/artifacts/gnunet/${CI_COMMIT_REF}/*.deb"
+RSYNC_HOST="taler.host.internal"
+RSYNC_PORT=424242
+RSYNC_PATH="incoming_packages/bookworm-taler-ci/"
+RSYNC_DEST="rsync://${RSYNC_HOST}/${RSYNC_PATH}"
+rsync -vP \
+      --port ${RSYNC_PORT} \
+      ${ARTIFACT_PATH} ${RSYNC_DEST}
diff --git a/contrib/conf/commit-msg b/contrib/conf/commit-msg
new file mode 100755
index 000000000..e57333c00
--- /dev/null
+++ b/contrib/conf/commit-msg
@@ -0,0 +1,34 @@
+#!/bin/bash
+# use as .git/hooks/commit-msg
+COMMIT_MSG_FILE=$1
+exec 1>&2
+RET=0
+changed=$(git diff --cached --name-only)
+for f in $changed;
+do
+ # Only headers in include
+ if echo $f | grep \src\/include\/.\*\.h\$  > /dev/null
+ then
+   RET=1
+   # Check if it has a NEWS line
+   if cat $COMMIT_MSG_FILE | grep -i "^NEWS:\s[-,a-zA-Z][a-zA-Z]*" > /dev/null
+   then
+       RET=0
+       break
+   fi
+ fi
+done
+# If no NEWS line found, abort
+if [ $RET = 1 ];
+then
+  echo "Your commit includes staged changes that indicate an API change which requires a NEWS line."
+else
+  echo "Your commit does not include API changes"
+fi
+exit 0
diff --git a/contrib/conf/gnunet/gnunet-system.conf b/contrib/conf/gnunet/gnunet-system.conf
index 6f9b0f379..dc0528cf3 100644
--- a/contrib/conf/gnunet/gnunet-system.conf
+++ b/contrib/conf/gnunet/gnunet-system.conf
@@ -1,7 +1,9 @@
-# Sample configuration file to be installed in /etc/gnunet.conf
+[path]
-# for a multi-user GNUnet setup.  This is then the configuration
+GNUNET_HOME = /var/lib/gnunet/
-# for the system-wide "gnunet" user.
+GNUNET_DATA_HOME = /var/lib/gnunet/data/
-[arm]
+GNUNET_RUNTIME_DIR = /var/run/gnunet/
-SYSTEM_ONLY = YES
-USER_ONLY = NO
+[arm]
+START_SYSTEM_SERVICES = YES
+START_USER_SERVICES = NO
+OPTIONS = -l /var/log/gnunet.log
diff --git a/contrib/conf/gnunet/gnunet-user.conf b/contrib/conf/gnunet/gnunet-user.conf
index de95c216c..f4763e45a 100644
--- a/contrib/conf/gnunet/gnunet-user.conf
+++ b/contrib/conf/gnunet/gnunet-user.conf
@@ -3,6 +3,6 @@
 # in the $HOME directory of each normal user (and in
 # /etc/skel/).
 [arm]
-SYSTEM_ONLY = NO
+START_SYSTEM_SERVICES = NO
-USER_ONLY = YES
+START_USER_SERVICES = YES
diff --git a/contrib/conf/gnunet/meson.build b/contrib/conf/gnunet/meson.build
new file mode 100644
index 000000000..0419784fb
--- /dev/null
+++ b/contrib/conf/gnunet/meson.build
@@ -0,0 +1,6 @@
+configure_file(copy: true,
+               input: 'no_forcestart.conf',
+               output: 'no_forcestart.conf')
+configure_file(copy: true,
+               input: 'no_autostart_above_core.conf',
+               output: 'no_autostart_above_core.conf')
diff --git a/contrib/conf/gnunet/no_autostart_above_core.conf b/contrib/conf/gnunet/no_autostart_above_core.conf
index 478addd29..8ed4dcb60 100644
--- a/contrib/conf/gnunet/no_autostart_above_core.conf
+++ b/contrib/conf/gnunet/no_autostart_above_core.conf
@@ -74,9 +74,6 @@ START_ON_DEMAND = NO
 [social]
 START_ON_DEMAND = NO
-[psyc]
-START_ON_DEMAND = NO
 [rps]
 START_ON_DEMAND = NO
@@ -89,8 +86,5 @@ START_ON_DEMAND = NO
 [sensor]
 START_ON_DEMAND = NO
-[zonemaster-monitor]
-START_ON_DEMAND = NO
 [zonemaster]
 START_ON_DEMAND = NO
diff --git a/contrib/conf/gnunet/no_forcestart.conf b/contrib/conf/gnunet/no_forcestart.conf
index 2c874489e..0c4a209be 100644
--- a/contrib/conf/gnunet/no_forcestart.conf
+++ b/contrib/conf/gnunet/no_forcestart.conf
@@ -40,12 +40,6 @@ IMMEDIATE_START = NO
 [zonemaster]
 IMMEDIATE_START = NO
-[zonemaster-monitor]
-IMMEDIATE_START = NO
-[psyc]
-IMMEDIATE_START = NO
 [rps]
 IMMEDIATE_START = NO
diff --git a/contrib/conf/meson.build b/contrib/conf/meson.build
new file mode 100644
index 000000000..f0e4647df
--- /dev/null
+++ b/contrib/conf/meson.build
@@ -0,0 +1 @@
+subdir('gnunet')
diff --git a/contrib/conf/prepare-commit-msg b/contrib/conf/prepare-commit-msg
new file mode 100755
index 000000000..a95f29430
--- /dev/null
+++ b/contrib/conf/prepare-commit-msg
@@ -0,0 +1,37 @@
+#!/bin/bash
+# use as .git/hooks/pre-commit
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
+exec 1>&2
+RET=0
+changed=$(git diff --cached --name-only)
+for f in $changed;
+do
+ # Only headers in include
+ if echo $f | grep \src\/include\/.\*\.h\$  > /dev/null
+ then
+    RET=1
+ fi
+done
+# Only add custom message when there is no commit source
+# ($COMMIT_SOURCE is empty). Otherwise, keep the default message
+# proposed by Git. Possible commit source: message, template,
+# merge, squash or commit.
+if [ -z "$COMMIT_SOURCE" ];
+then
+  hint=$(cat "$COMMIT_MSG_FILE")
+  echo -e "# Our commit subject format policy is:\n# <subsystem>: <description>\n# Adding 'Issue #1234'/'Fixes #1234' into the description will automatically update/resolve issue #1234 in mantis." > "$COMMIT_MSG_FILE"
+  if [ $RET = 1 ];
+  then
+    echo -e "# Your commit includes staged changes that indicate an API change which requires a NEWS line." >> "$COMMIT_MSG_FILE"
+  fi
+  echo "$hint" >> "$COMMIT_MSG_FILE"
+fi
+exit 0
diff --git a/contrib/conf/uncrustify.cfg b/contrib/conf/uncrustify.cfg
index b02ebc4a5..af2d8e69c 100644
--- a/contrib/conf/uncrustify.cfg
+++ b/contrib/conf/uncrustify.cfg
@@ -4,7 +4,7 @@ output_tab_size = 2
 indent_columns = 2
 indent_with_tabs = 0
 indent_case_brace = 2
-indent_label=0
+indent_label=-16
 code_width=80
 #cmd_width=80
@@ -49,8 +49,12 @@ nl_assign_brace=remove
 # No extra newlines that cause noisy diffs
 nl_start_of_file=remove
+nl_after_func_proto = 2
+nl_after_func_body = 3
 # If there's no new line, it's not a text file!
 nl_end_of_file=add
+nl_max_blank_in_func = 3
+nl_max = 3
 sp_inside_paren = remove
@@ -69,6 +73,7 @@ sp_between_ptr_star = remove
 sp_before_sparen = add
 sp_inside_fparen = remove
+sp_inside_sparen = remove
 # add space before function call and decl: "foo (x)"
 sp_func_call_paren = add
@@ -76,3 +81,15 @@ sp_func_proto_paren = add
 sp_func_proto_paren_empty = add
 sp_func_def_paren = add
 sp_func_def_paren_empty = add
+# We'd want it for "if ( (foo) || (bar) )", but not for "if (m())",
+# so as uncrustify doesn't give exactly what we want => ignore
+sp_paren_paren = ignore
+sp_inside_paren = remove
+sp_bool = force
+nl_func_type_name = force
+#nl_branch_else = add
+nl_else_brace = add
+nl_elseif_brace = add
+nl_for_brace = add
diff --git a/contrib/conf/uncrustify_precommit b/contrib/conf/uncrustify_precommit
index 3a06511d1..8e0a605b3 100755
--- a/contrib/conf/uncrustify_precommit
+++ b/contrib/conf/uncrustify_precommit
@@ -28,8 +28,11 @@ done
 if [ $RET = 1 ];
 then
-  echo "Run"
+  echo "================================================================"
-  echo "uncrustify --replace -c uncrustify.cfg ${crustified}"
+  echo " Your changes are ugly!                                         "
-  echo "before committing."
+  echo " Uncrustify your code in your next commit.                      "
+  echo " See https://docs.gnunet.org/latest/developers/style.html#coding-style "
+  echo "================================================================"
 fi
-exit $RET
+# Do not fail
+exit 0
diff --git a/contrib/docker/.dockerignore b/contrib/docker/.dockerignore
new file mode 100644
index 000000000..c9c567673
--- /dev/null
+++ b/contrib/docker/.dockerignore
@@ -0,0 +1,2 @@
+Dockerfile
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index adcd7132c..de087df71 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -1,16 +1,39 @@
-FROM ubuntu:18.04
+# FROM ubuntu:20.04
+FROM debian:stable
 ENV DEBIAN_FRONTEND noninteractive
 # Install tools and dependencies
 RUN apt-get update && \
-    apt-get -y install --no-install-recommends \
+      apt-get upgrade && \
+      apt-get -y install --no-install-recommends \
+      apt-utils
+# Install tools and dependencies
+RUN apt-get update && \
+      apt-get upgrade && \
+      apt-get -y install --no-install-recommends \
      ca-certificates \
+      iptables \
+      python3 \
+      python3-pip \
+      iproute2 \
+      net-tools \
      libsasl2-modules \
      git \
      automake \
      autopoint \
      autoconf \
+      recutils \
+      make \
+      libssl-dev \
+      ninja-build \
+      meson \
+      curl \
+      libcurl4-gnutls-dev \
+      libsodium-dev \
+      libsodium23 \
+      libjansson-dev \
      texinfo \
      libtool \
      libltdl-dev \
@@ -25,74 +48,67 @@ RUN apt-get update && \
      libgcrypt20-dev \
      libpq-dev \
      libsqlite3-dev \
-      wget && \
+      wget
-    apt-get clean all && \
+RUN apt-get clean all && \
    apt-get -y autoremove && \
    rm -rf \
      /var/lib/apt/lists/* \
      /tmp/*
-# Install GNUrl
+# Install jose
-ENV GNURL_VERSION=7.57.0
+RUN wget -O /tmp/jose.tar.gz https://github.com/latchset/jose/archive/refs/tags/v11.tar.gz
-RUN wget -O /tmp/gnurl.tar.xz https://ftpmirror.gnu.org/gnu/gnunet/gnurl-${GNURL_VERSION}.tar.xz
 RUN cd /tmp && \
-      tar xvf gnurl.tar.xz && \
+      tar xvf jose.tar.gz && \
-      cd gnurl-${GNURL_VERSION} && \
+      cd jose-11 && \
-      autoreconf -i && \
+      mkdir build && \
-      ./configure \
+      cd build && \
-        --enable-ipv6 \
+      meson .. --prefix=/usr/local/lib && \
-        --with-gnutls \
+      ninja && \
-        --without-libssh2 \
+      ninja install && \
-        --without-libmetalink \
+      cd / && \
-        --without-winidn \
+      rm -rf /tmp/jose-11/*
-        --without-librtmp \
-        --without-nghttp2 \
+# Intall Python Packages for Documentation
-        --without-nss \
+RUN pip3 install \
-        --without-cyassl \
+    docutils==0.17.1 \
-        --without-polarssl \
+    sphinx \
-        --without-ssl \
+    sphinx-rtd-theme
-        --without-winssl \
-        --without-darwinssl \
+COPY . /tmp/gnunet
-        --disable-sspi \
-        --disable-ntlm-wb \
+# ENV VERSION=0.18.1
-        --disable-ldap \
+# ENV HASH=719fc54734ee54c36ff619a6aa2d659655db012c40f9210c0859459c435fce1a
-        --disable-rtsp \
+# RUN wget "ftpmirror.gnu.org/gnunet/gnunet-$VERSION.tar.gz" -P /tmp
-        --disable-dict \
-        --disable-telnet \
+# Check the gnunet download integrity
-        --disable-tftp \
+# RUN echo "$HASH /tmp/gnunet-$VERSION.tar.gz" | sha256sum --check --status
-        --disable-pop3 \
-        --disable-imap \
-        --disable-smtp \
-        --disable-gopher \
-        --disable-file \
-        --disable-ftp \
-        --disable-smb && \
-      make install && \
-    cd - && \
-    rm -rf /tmp/gnurl*
-# Install GNUnet
+# Extract gnunet
-ENV GNUNET_PREFIX /usr/local/gnunet
+# RUN mkdir /tmp/gnunet && tar xf "/tmp/gnunet-$VERSION.tar.gz" -C /tmp/gnunet --strip-components=1
-ENV CFLAGS '-g -Wall -O0'
-COPY . /gnunet
+# Install gnunet
+# ENV GNUNET_PREFIX=/usr/local/lib
+# ENV CFLAGS '-g -Wall -O0'
+# 
+# RUN cd /tmp/gnunet && \
+#       ./configure \
+#         --prefix="$GNUNET_PREFIX/.." \
+#         --enable-logging=verbose && \
+#       make -j && \
+#       make install && \
+#       ldconfig
-RUN cd /gnunet && \
+RUN cd /tmp/gnunet && \
      ./bootstrap && \
      ./configure \
-        --with-nssdir=/lib \
+        --prefix="$GNUNET_PREFIX/.." \
-        --prefix="$GNUNET_PREFIX" \
        --enable-logging=verbose && \
-      make -j3 && \
+      make -j && \
      make install && \
-      ldconfig && \
+      ldconfig
-    cd - && \
-    rm -fr /gnunet
 # Configure GNUnet
-COPY ./contrib/docker/gnunet.conf /etc/gnunet.conf
+RUN cp /tmp/gnunet/contrib/docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
-COPY ./contrib/docker/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
 RUN chmod 755 /usr/local/bin/docker-entrypoint
 ENV LOCAL_PORT_RANGE='40001 40200'
diff --git a/contrib/docker/README.md b/contrib/docker/README.md
index ce05012fc..66ba45d26 100644
--- a/contrib/docker/README.md
+++ b/contrib/docker/README.md
@@ -10,13 +10,14 @@ This will take quite a while and will consume a bit of data.
 First you need to go to the root of this repo.
 ```bash
-cd ..
+cd ../..
 ```
 Now you can build the image.
 ```bash
-docker build -t gnunet .
+make clean
+docker build -f contrib/docker/Dockerfile -t gnunet .
 ```
 ## Start it from the newly created gnunet image
diff --git a/contrib/docker/docker-entrypoint.sh b/contrib/docker/docker-entrypoint.sh
index 7f98ef68b..7613c6b65 100644
--- a/contrib/docker/docker-entrypoint.sh
+++ b/contrib/docker/docker-entrypoint.sh
@@ -1,15 +1,5 @@
 #!/bin/bash -e
-echo "${LOCAL_PORT_RANGE:-49152 65535}" > /proc/sys/net/ipv4/ip_local_port_range
+exec gnunet-arm \
-sed -i 's/$GNUNET_PORT/'${GNUNET_PORT:-2086}'/g' /etc/gnunet.conf
+  --start \
+  --monitor
-if [[ $# -eq 0 ]]; then
-  exec gnunet-arm \
-    --config=/etc/gnunet.conf \
-    --start \
-    --monitor
-elif [[ -z $1 ]] || [[ ${1:0:1} == '-' ]]; then
-  exec gnunet-arm "$@"
-else
-  exec "$@"
-fi
diff --git a/contrib/docker/gnunet.conf b/contrib/docker/gnunet.conf
deleted file mode 100644
index c8299ef46..000000000
--- a/contrib/docker/gnunet.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-[arm]
-SYSTEM_ONLY = NO
-USER_ONLY = NO
-[fs]
-FORCESTART = NO
-[nat]
-ENABLE_UPNP = NO
-BEHIND_NAT = YES
-[transport-tcp]
-PORT = $GNUNET_PORT
-ADVERTISED_PORT = $GNUNET_PORT
-[transport-udp]
-PORT = $GNUNET_PORT
-BROADCAST = YES
-[cadet]
-TESTING_IGNORE_KEYS = ACCEPT_FROM;
diff --git a/contrib/fcfsd/fcfsd-forbidden.html b/contrib/fcfsd/fcfsd-forbidden.html
deleted file mode 100644
index 57ebb4c61..000000000
--- a/contrib/fcfsd/fcfsd-forbidden.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Forbidden - GNUnet FCFS Authority Name Registration Service</title>
-  </head>
-  <body>
-    <h1>You can not access this resource.</h1>
-  </body>
-</html>
diff --git a/contrib/fcfsd/fcfsd-index.html b/contrib/fcfsd/fcfsd-index.html
deleted file mode 100644
index 3fa71d7c8..000000000
--- a/contrib/fcfsd/fcfsd-index.html
+++ /dev/null
@@ -1,345 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>GNUnet FCFS Authority Name Registration Service</title>
-    <style>
-      html {
-          box-sizing: border-box;
-          font-family: sans-serif;
-      }
-      *, *:before, *:after {
-          box-sizing: inherit;
-      }
-      header {
-          width: 800px;
-          margin: 0 auto;
-      }
-      main {
-          width: 800px;
-          margin: 0 auto;
-      }
-      section h4 {
-          text-align: center;
-          width: 100%;
-      }
-      section input {
-          width: 100%;
-          padding: 8px 17px;
-          font-size: 1rem;
-          border: 1px solid #aaa;
-          border-radius: 7px;
-          background-color: white;
-          margin-bottom: 7px;
-      }
-      section input:focus {
-          box-shadow: 0px 0px 5px 3px lightblue;
-      }
-      section button {
-          font-size: 1rem;
-          font-weight: bold;
-          background-color: #8b008b;
-          color: white;
-          border: none;
-          padding: 7px;
-      }
-      section button:hover {
-          background-color: #bf00bf;
-      }
-      section button:disabled {
-          background-color: gray;
-      }
-      section h3 {
-          text-align: center;
-          width: 100%;
-      }
-      section small {
-          display: block;
-          margin-bottom: 5px;
-      }
-      .error-message {
-          color: red;
-      }
-      .success-message {
-          color: green;
-      }
-      @media screen and (max-width: 991px) {
-          header, main {
-              width: 100%;
-          }
-      }
-      footer {
-          margin-top: 30px;
-          text-align: center;
-      }
-      nav {
-          border-bottom: 1px solid black;
-      }
-      nav button {
-          font-size: 1rem;
-          font-weight: bold;
-          background-color: #ccc;
-          border: 1px solid black;
-          border-bottom: none;
-          border-top-right-radius: 7px;
-          border-top-left-radius: 7px;
-          padding: 7px;
-      }
-      nav button:hover {
-          background-color: #f0f0f0;
-          cursor: pointer;
-      }
-      nav button.selected {
-          background-color: #f0f0f0;
-      }
-    </style>
-  </head>
-  <body>
-    <header>
-      <h1>Name Registration Service</h1>
-      <p>Here you can register a name for your zone as part of this service's
-        delegated names.</p>
-      <p>The registration is based on a <em>First Come First Served</em>
-        policy, meaning a name is given to the first user requesting it.</p>
-      <p>Use the search bar below to see if your desired name is available and
-      then use the form to submit your registration request.</p>
-    </header>
-    <main>
-      <div class="form-container">
-        <nav>
-          <button id="tab-search">Search</button>
-          <button id="tab-register">Register</button>
-        </nav>
-        <section id="search-form">
-          <h4>Is your name available?</h4>
-          <h3 id="search-result-message"></h3>
-          <input id="search-name"
-                 name="search-name"
-                 type="text"
-                 placeholder="Your name..."
-                 autocomplete="name"
-                 maxlength="63"
-                 minlength="1">
-          <small class="error-message" id="search-name-error"></small>
-          <button>Search</button>
-        </section>
-        <section id="submit-form">
-          <h4>Submit a registration request</h4>
-          <h3 id="submit-result-message"></h3>
-          <input id="register-name"
-                 name="register-name"
-                 type="text"
-                 placeholder="Your name..."
-                 autocomplete="off"
-                 maxlength="63"
-                 minlength="1">
-          <input id="register-value"
-                 name="register-value"
-                 type="text"
-                 placeholder="Your zone key..."
-                 autocomplete="off"
-                 minlength="1">
-          <small class="error-message" id="submit-error"></small>
-          <button>Submit</button>
-        </section>
-      </div>
-    </main>
-    <footer>
-      <a href="https://gnunet.org">GNUnet homepage</a>
-    </footer>
-    <script>
-      const buttons = document.querySelectorAll('nav button');
-      for (let i=0; i<buttons.length; ++i) {
-          buttons[i].onclick = function (e) {
-              let selected = document.querySelector('nav button.selected');
-              if (selected) {
-                  selected.classList.toggle('selected');
-              }
-              e.target.classList.toggle('selected');
-              let show = '';
-              let hide = '';
-              if (e.target.id === 'tab-search') {
-                  show = 'search-form';
-                  hide = 'submit-form';
-              } else {
-                  show = 'submit-form';
-                  hide = 'search-form'
-              }
-              document.getElementById(hide).style.display = 'none';
-              document.getElementById(show).style.display = 'block';
-          };
-      }
-      buttons[0].click({target: buttons[0]});
-      const searchbutton = document.querySelector('#search-form button');
-      const submitbutton = document.querySelector('#submit-form button');
-      document.getElementById('search-name').onkeydown = function (e) {
-          if (e.key !== 'Enter') {
-              return;
-          }
-          searchbutton.click();
-      };
-      for (let n of ['register-name', 'register-value']) {
-          document.getElementById(n).onkeydown = function (e) {
-              if (e.key !== 'Enter') {
-                  return;
-              }
-              submitbutton.click();
-          };
-      }
-      searchbutton.onclick = function (e) {
-          const searchname = document.getElementById('search-name');
-          const errormsg = document.getElementById('search-name-error');
-          const resultmsg = document.getElementById('search-result-message');
-          if (0 === searchname.value.length) {
-              errormsg.innerText = 'The field can not be empty';
-              searchname.setCustomValidity('The field can not be empty');
-              return;
-          }
-          if (-1 !== searchname.value.indexOf('.')) {
-              errormsg.innerText = 'The name can not contain dots';
-              searchname.setCustomValidity('The name can not contain dots');
-              return;
-          }
-          searchname.setCustomValidity('');
-          errormsg.innerText = '';
-          const name = searchname.value.toLowerCase();
-          searchbutton.disabled = true;
-          submitbutton.disabled = true;
-          fetch(`/search?name=${name}`)
-              .then(function (response) {
-                  if (!response.ok) {
-                      throw 'error';
-                  }
-                  return response.json()
-              })
-              .then(function (data) {
-                  if ("true" === data.free) {
-                      resultmsg.innerText = `'${name}' is available!`;
-                      resultmsg.classList.add('success-message');
-                      resultmsg.classList.remove('error-message');
-                  } else {
-                      resultmsg.innerText = `'${name}' is not available`;
-                      resultmsg.classList.remove('success-message');
-                      resultmsg.classList.add('error-message');
-                  }
-                  searchbutton.disabled = false;
-                  submitbutton.disabled = false;
-              })
-              .catch(function (error) {
-                  resultmsg.innerText = 'An error occurred while processing your query';
-                  resultmsg.classList.remove('success-message');
-                  resultmsg.classList.add('error-message');
-                  console.error(error);
-                  searchbutton.disabled = false;
-                  submitbutton.disabled = false;
-              });
-      };
-      submitbutton.onclick = function (e) {
-          const registername = document.getElementById('register-name');
-          const registervalue = document.getElementById('register-value');
-          const errormsg = document.getElementById('submit-error');
-          const resultmsg = document.getElementById('submit-result-message');
-          let errors = 0;
-          let errs = [];
-          if (0 === registername.value.length) {
-              errs.push('The name field can not be empty');
-              registername.setCustomValidity('The name field can not be empty');
-              ++errors;
-          }
-          if (-1 !== registername.value.indexOf('.')) {
-              errs.push('The name can not contain dots');
-              registername.setCustomValidity('The name can not contain dots');
-              ++errors;
-          }
-          if (0 === registervalue.value.length) {
-              errs.push('The value field can not be empty');
-              registervalue.setCustomValidity('The value field can not be empty');
-              ++errors;
-          }
-          if (0 < errors) {
-              errormsg.innerHTML = 'The form contains invalid values:';
-              for (let e of errs) {
-                  errormsg.innerHTML += '<br/>' + e;
-              }
-              return;
-          }
-          searchbutton.disabled = true;
-          submitbutton.disabled = true;
-          fetch('/register', {
-              method: 'POST',
-              cache: 'no-cache',
-              headers: {
-                  'Content-Type': 'application/json',
-              },
-              body: JSON.stringify({
-                  name: registername.value,
-                  key: registervalue.value,
-              }),
-          }).then(function (response) {
-              return response.json();
-          }).then(function (data) {
-              if (data.error === "false") {
-                  resultmsg.innerText = `'${registername.value}' was registered successfully!`;
-                  resultmsg.classList.add('success-message');
-                  resultmsg.classList.remove('error-message');
-              } else {
-                  resultmsg.innerText = `'${registername.value}' could not be registered! (${data.message})`;
-                  resultmsg.classList.remove('success-message');
-                  resultmsg.classList.add('error-message');
-              }
-              searchbutton.disabled = false;
-              submitbutton.disabled = false;
-          }).catch(function (error) {
-              resultmsg.innerText = 'An error occurred while processing your query';
-              resultmsg.classList.remove('success-message');
-              resultmsg.classList.add('error-message');
-              console.error(error);
-              searchbutton.disabled = false;
-              submitbutton.disabled = false;
-          });
-      };
-    </script>
-  </body>
-</html>
diff --git a/contrib/fcfsd/fcfsd-notfound.html b/contrib/fcfsd/fcfsd-notfound.html
deleted file mode 100644
index 676bf4a9a..000000000
--- a/contrib/fcfsd/fcfsd-notfound.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Not Found - GNUnet FCFS Authority Name Registration Service</title>
-  </head>
-  <body>
-    <h1>The requested resource could not be found</h1>
-  </body>
-</html>
diff --git a/contrib/gana b/contrib/gana
-Subproject 7bfe1654eeab7e7eacb4f6eb45ad52ffe4511c4
+Subproject d505fecdf8f1339f4115f10f1ae236da7cfea0e
diff --git a/contrib/get_version.sh b/contrib/get_version.sh
deleted file mode 100755
index 2a41ed4d6..000000000
--- a/contrib/get_version.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# Gets the version number from git, or from the contents of .version
-VERSION=
-if test -f ".version"
-then
-  VERSION=$(cat .version)
-fi
-if test -d "./.git"
-then
-  VERSION=$(git describe --tags)
-  VERSION=${VERSION#v}
-  echo $VERSION > .version
-fi
-if test "x$VERSION" = "x"
-then
-  VERSION="unknown"
-fi
-echo "$VERSION"
diff --git a/contrib/gns/def.tex b/contrib/gns/def.tex
deleted file mode 100644
index 51649c149..000000000
--- a/contrib/gns/def.tex
+++ /dev/null
@@ -1,15 +0,0 @@
-\def\prefix{}
-\def\name{Sree Harsha Totakura}
-\def\suffix{M.Sc.}
-\def\phone{+49-89-289-18011}
-\def\fax{+49-89-289-18033}
-\def\email{sreeharsha@totakura.in}
-\def\homepage{http://sreeharsha.totakura.in/}
-\def\org{Technische Universit\"at M\"unchen}
-\def\department{Department of Computer Science}
-\def\subdepartment{Network Architectures and Services}
-\def\jobtitle{Free Secure Network Systems Group}
-\def\gpglineone{8E68 1D8A 25AB B102 AFB5}
-\def\gpglinetwo{4B40 3B6F 8AF1 43C2 1F3B}
-\def\gns{LOC36VTJD3IRULMM6C20TGE6D3SVEAJOHI9KRI5KAQVQ87UJGPJG/totakura}
diff --git a/contrib/gns/gns-bcd-forbidden.html b/contrib/gns/gns-bcd-forbidden.html
deleted file mode 100644
index 59cdf3b04..000000000
--- a/contrib/gns/gns-bcd-forbidden.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Error</title>
-    <style>
-      /* "Reset" values */
-      html {
-          box-sizing: border-box;
-      }
-      *, *:before, *:after {
-          box-sizing: inherit;
-      }
-      body {
-          font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif;
-          font-size: 1rem;
-          font-weight: 400;
-          line-height: 1.5;
-          background-color: #ffffff;
-          color: #212121;
-          margin: 0;
-      }
-      h1, h2, h3, h4, h5 {
-          margin-top: 0px;
-          margin-bottom: 0.5rem;
-          font-weight: 500;
-      }
-      p {
-          margin-top: 0px;
-          margin-bottom: 1rem;
-      }
-      /* "Component" values */
-      .gns-container {
-          max-width: 100%;
-          margin-left: auto;
-          margin-right: auto;
-      }
-      @media (min-width: 576px) {
-          .gns-container {
-              max-width: 540px;
-          }
-      }
-      @media (min-width: 768px) {
-          .gns-container {
-              max-width: 720px;
-          }
-      }
-      @media (min-width: 992px) {
-          .gns-container {
-              max-width: 960px;
-          }
-      }
-      @media (min-width: 1200px) {
-          .gns-container {
-              max-width: 1140px;
-          }
-      }
-      @media (min-width: 1400px) {
-          .gns-container {
-              max-width: 1320px;
-          }
-      }
-    </style>
-  </head>
-  <body>
-    <div class="gns-container">
-      <h1>Forbidden</h1>
-      <p>You do not have the rights to access this resource.</p>
-    </div>
-  </body>
-</html>
diff --git a/contrib/gns/gns-bcd-internal-error.html b/contrib/gns/gns-bcd-internal-error.html
deleted file mode 100644
index 460d41213..000000000
--- a/contrib/gns/gns-bcd-internal-error.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Error</title>
-    <style>
-      /* "Reset" values */
-      html {
-          box-sizing: border-box;
-      }
-      *, *:before, *:after {
-          box-sizing: inherit;
-      }
-      body {
-          font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif;
-          font-size: 1rem;
-          font-weight: 400;
-          line-height: 1.5;
-          background-color: #ffffff;
-          color: #212121;
-          margin: 0;
-      }
-      h1, h2, h3, h4, h5 {
-          margin-top: 0px;
-          margin-bottom: 0.5rem;
-          font-weight: 500;
-      }
-      p {
-          margin-top: 0px;
-          margin-bottom: 1rem;
-      }
-      /* "Component" values */
-      .gns-container {
-          max-width: 100%;
-          margin-left: auto;
-          margin-right: auto;
-      }
-      @media (min-width: 576px) {
-          .gns-container {
-              max-width: 540px;
-          }
-      }
-      @media (min-width: 768px) {
-          .gns-container {
-              max-width: 720px;
-          }
-      }
-      @media (min-width: 992px) {
-          .gns-container {
-              max-width: 960px;
-          }
-      }
-      @media (min-width: 1200px) {
-          .gns-container {
-              max-width: 1140px;
-          }
-      }
-      @media (min-width: 1400px) {
-          .gns-container {
-              max-width: 1320px;
-          }
-      }
-    </style>
-  </head>
-  <body>
-    <div class="gns-container">
-      <h1>Internal Server Error</h1>
-      <p>The server could not process your request.</p>
-    </div>
-  </body>
-</html>
diff --git a/contrib/gns/gns-bcd-invalid-key.html b/contrib/gns/gns-bcd-invalid-key.html
deleted file mode 100644
index 25c8ba092..000000000
--- a/contrib/gns/gns-bcd-invalid-key.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Error</title>
-    <style>
-      /* "Reset" values */
-      html {
-          box-sizing: border-box;
-      }
-      *, *:before, *:after {
-          box-sizing: inherit;
-      }
-      body {
-          font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif;
-          font-size: 1rem;
-          font-weight: 400;
-          line-height: 1.5;
-          background-color: #ffffff;
-          color: #212121;
-          margin: 0;
-      }
-      h1, h2, h3, h4, h5 {
-          margin-top: 0px;
-          margin-bottom: 0.5rem;
-          font-weight: 500;
-      }
-      p {
-          margin-top: 0px;
-          margin-bottom: 1rem;
-      }
-      /* "Component" values */
-      .gns-container {
-          max-width: 100%;
-          margin-left: auto;
-          margin-right: auto;
-      }
-      @media (min-width: 576px) {
-          .gns-container {
-              max-width: 540px;
-          }
-      }
-      @media (min-width: 768px) {
-          .gns-container {
-              max-width: 720px;
-          }
-      }
-      @media (min-width: 992px) {
-          .gns-container {
-              max-width: 960px;
-          }
-      }
-      @media (min-width: 1200px) {
-          .gns-container {
-              max-width: 1140px;
-          }
-      }
-      @media (min-width: 1400px) {
-          .gns-container {
-              max-width: 1320px;
-          }
-      }
-    </style>
-  </head>
-  <body>
-    <div class="gns-container">
-      <h1>Invalid key</h1>
-      <p>The given GNS public key is not valid.</p>
-    </div>
-  </body>
-</html>
diff --git a/contrib/gns/gns-bcd-not-found.html b/contrib/gns/gns-bcd-not-found.html
deleted file mode 100644
index 999d6f604..000000000
--- a/contrib/gns/gns-bcd-not-found.html
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Error</title>
-    <style>
-      /* "Reset" values */
-      html {
-          box-sizing: border-box;
-      }
-      *, *:before, *:after {
-          box-sizing: inherit;
-      }
-      body {
-          font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif;
-          font-size: 1rem;
-          font-weight: 400;
-          line-height: 1.5;
-          background-color: #ffffff;
-          color: #212121;
-          margin: 0;
-      }
-      h1, h2, h3, h4, h5 {
-          margin-top: 0px;
-          margin-bottom: 0.5rem;
-          font-weight: 500;
-      }
-      p {
-          margin-top: 0px;
-          margin-bottom: 1rem;
-      }
-      /* "Component" values */
-      .gns-container {
-          max-width: 100%;
-          margin-left: auto;
-          margin-right: auto;
-      }
-      @media (min-width: 576px) {
-          .gns-container {
-              max-width: 540px;
-          }
-      }
-      @media (min-width: 768px) {
-          .gns-container {
-              max-width: 720px;
-          }
-      }
-      @media (min-width: 992px) {
-          .gns-container {
-              max-width: 960px;
-          }
-      }
-      @media (min-width: 1200px) {
-          .gns-container {
-              max-width: 1140px;
-          }
-      }
-      @media (min-width: 1400px) {
-          .gns-container {
-              max-width: 1320px;
-          }
-      }
-    </style>
-  </head>
-  <body>
-    <div class="gns-container">
-      <h1>Not Found</h1>
-      <p>The requested resource could not be found.</p>
-    </div>
-  </body>
-</html>
diff --git a/contrib/gns/gns-bcd-png.tex b/contrib/gns/gns-bcd-png.tex
deleted file mode 100644
index 4bf98e136..000000000
--- a/contrib/gns/gns-bcd-png.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-\documentclass[convert={ghostscript}]{standalone}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{qrcode}
-\input{def.tex}
-\begin{document}
-\qrcode[height=13cm,level=Q]{gnunet://gns/\gns}
-\end{document}
diff --git a/contrib/gns/gns-bcd-simple.html b/contrib/gns/gns-bcd-simple.html
deleted file mode 100644
index 11b99e2b1..000000000
--- a/contrib/gns/gns-bcd-simple.html
+++ /dev/null
@@ -1,177 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Create your GNU Name System Business Card</title>
-    <style>
-      /* "Reset" values */
-      html {
-          box-sizing: border-box;
-      }
-      *, *:before, *:after {
-          box-sizing: inherit;
-      }
-      body {
-          font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif;
-          font-size: 1rem;
-          font-weight: 400;
-          line-height: 1.5;
-          background-color: #ffffff;
-          color: #212121;
-          margin: 0;
-      }
-      h1, h2, h3, h4, h5 {
-          margin-top: 0px;
-          margin-bottom: 0.5rem;
-          font-weight: 500;
-      }
-      p {
-          margin-top: 0px;
-          margin-bottom: 1rem;
-      }
-      fieldset{
-          margin: 0px;
-          padding: 0px;
-          border: 0px;
-          min-width: 0px;
-      }
-      label {
-          display: inline-block;
-      }
-      input {
-          margin: 0px;
-          font-family: inherit;
-          font-size: inherit;
-          line-height: inherit;
-      }
-      /* "Component" values */
-      .gns-container {
-          max-width: 100%;
-          margin-left: auto;
-          margin-right: auto;
-      }
-      .gns-header {
-          padding-top: 1rem;
-          padding-bottom: 0.25rem;
-      }
-      .gns-form-group {
-          margin-bottom: 1.5rem;
-      }
-      .gns-field:not(:last-child) {
-          margin-bottom: 1rem;
-      }
-      .gns-label {
-          margin-bottom: 0.25rem;
-      }
-      .gns-text-input {
-          display: block;
-          width: 100%;
-          padding: 0.375rem 0.75rem;
-          color: #212121;
-          background-color: #ffffff;
-          border: 1px solid #ced4da;
-          border-radius: 0.20rem;
-      }
-      .gns-text-input:focus {
-          box-shadow: 0px 0px 9px rgba(102, 175, 233, 0.5);
-          border: 1px solid rgb(102, 175, 233);
-      }
-      .gns-check-input {
-          width: 1rem;
-          height: 1rem;
-          margin-top: 0.25rem;
-          margin-right: 0.25rem;
-      }
-      .gns-button {
-          display: inline-block;
-          text-align: center;
-          text-decoraton: none;
-          vertical-align: middle;
-          cursor: pointer;
-          border: 1px solid transparent;
-          padding: 0.375rem 0.75rem;
-          border-radius: 0.20rem;
-      }
-      .gns-button:focus {
-          box-shadow: 0px 0px 9px rgba(200, 200, 200, 0.75);
-          border: 1px solid rgb(98, 98, 98);
-      }
-      @media (min-width: 576px) {
-          .gns-container {
-              max-width: 540px;
-          }
-      }
-      @media (min-width: 768px) {
-          .gns-container {
-              max-width: 720px;
-          }
-      }
-      @media (min-width: 992px) {
-          .gns-container {
-              max-width: 960px;
-          }
-      }
-      @media (min-width: 1200px) {
-          .gns-container {
-              max-width: 1140px;
-          }
-      }
-      @media (min-width: 1400px) {
-          .gns-container {
-              max-width: 1320px;
-          }
-      }
-    </style>
-  </head>
-  <body>
-    <div class="gns-container">
-      <div class="gns-header">
-        <h1>GNU Name System Business Card</h1>
-        <p>Please fill in the information below to generate your business
-          card.</p>
-        <p>Want a more detailed card? Use the <a href="/full">full
-            form</a>.</p>
-      </div>
-      <form name="gnsinput" action="/submit/simple" method="get">
-        <fieldset class="gns-form-group">
-          <div class="gns-field">
-            <label class="gns-label" for="name">Full Name:</label>
-            <input class="gns-text-input" name="name" type="text" required>
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="email">E-mail:</label>
-            <input class="gns-text-input" name="email" type="email" required>
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="homepage">Homepage:</label>
-            <input class="gns-text-input" name="homepage" type="text" required>
-          </div>
-        </fieldset>
-        <fieldset class="gns-form-group">
-          <div class="gns-field">
-            <label class="gns-label" for="gnskey">GNS Public Key</label>
-            <input class="gns-text-input" name="gnskey" type="text" required>
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="gnsnick">GNS Nickname:</label>
-            <input class="gns-text-input" name="gnsnick" type="text" required>
-          </div>
-        </fieldset>
-        <fieldset class="gns-form-group">
-          <div class="gns-field">
-            <input class="gns-check-input" name="gnspng" id="gnspng" type="checkbox" value="true">
-            <label class="gns-label" for="gnspng">Generate only QR Code (as PNG)</label>
-          </div>
-        </fieldset>
-        <fieldset class="gns-form-group">
-          <div class="gns-field">
-            <input class="gns-button"
-                   type="submit"
-                   value="Generate Business Card">
-          </div>
-        </fieldset>
-      </form>
-    </div>
-  </body>
-</html>
diff --git a/contrib/gns/gns-bcd-simple.tex b/contrib/gns/gns-bcd-simple.tex
deleted file mode 100644
index 453fd6c47..000000000
--- a/contrib/gns/gns-bcd-simple.tex
+++ /dev/null
@@ -1,160 +0,0 @@
-\documentclass[a4paper,oneside]{scrartcl}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{tikz}
-\usepackage{ifthen}
-\usepackage{qrcode}
-\usepackage[newdimens]{labels}
-\LabelCols=2
-\LabelRows=5
-\LeftPageMargin=17.0mm
-\RightPageMargin=17.0mm
-\TopPageMargin=10.0mm
-\BottomPageMargin=10.0mm
-\InterLabelColumn=3.5mm
-\InterLabelRow=3.0mm
-\numberoflabels=10
-\LabelGridtrue
-\renewcommand{\rmdefault}{phv}
-\renewcommand{\seriesdefault}{m}
-\renewcommand{\shapedefault}{n}
-\input{def.tex}
-\setlength\parindent{0pt}
-\newcommand{\logo}{
-  \begin{tikzpicture}
-    [every node/.style={circle,fill=black!73,inner sep=0pt,minimum size=2.2mm},
-      every edge/.style={draw,semithick},
-      x=1pt,y=1pt]
-    \node (p1)  at (21.57,-219.43)  {};
-    \node (p2)  at (41.44,-168.86)  {}
-    edge (p1);
-    \node (p3)  at (54.16,-130.86)  {}
-    edge (p2);
-    \node (p4)  at (-21.62,-219.43) {}
-    edge (p1);
-    \node (p5)  at (10.41,-158.90)  {}
-    edge (p2);
-    \node (p6)  at (-22.20,-173.21) {}
-    edge (p4);
-    \node (p9)  at (-147.32,-37.53) {};
-    \node (p10) at (-97.30,-18.50)  {}
-    edge (p9);
-    \node (p11) at (74.95,-89.64)   {}
-    edge (p3);
-    \node (p12) at (-0.20,-182.48)  {}
-    edge (p1)
-    edge (p4)
-    edge (p5)
-    edge (p6)
-    edge (p3);
-    \node (p13) at (18.79,-190.31)  {}
-    edge (p2)
-    edge (p1)
-    edge (p5)
-    edge (p4);
-    \node (p14) at (-46.77,-141.82) {}
-    edge (p6)
-    edge (p4);
-    \node (p15) at (-14.08,-141.91) {}
-    edge (p5)
-    edge (p6)
-    edge (p12);
-    \node (p16) at (-96.66,-90.02)  {};
-    \node (p17) at (-71.34,-90.78)  {}
-    edge (p16)
-    edge (p14);
-    \node (p18) at (-25.92,-109.84) {}
-    edge (p15)
-    edge (p17)
-    edge (p14);
-    \node (p19) at (-46.78,-94.06)  {}
-    edge (p18)
-    edge (p17)
-    edge (p14)
-    edge (p15);
-    \node (p20) at (51.95,-67.01)   {}
-    edge (p3)
-    edge (p11);
-    \node (p21) at (29.21,-103.63)  {}
-    edge (p11)
-    edge (p20)
-    edge (p3)
-    edge (p5)
-    edge (p2);
-    \node (p22) at (-116.84,-55.89) {}
-    edge (p10)
-    edge (p9);
-    \node (p23) at (-61.14,-62.16)  {}
-    edge (p18)
-    edge (p19)
-    edge (p17)
-    edge (p16);
-    \node (p24) at (107.08,-62.78)  {}
-    edge (p20)
-    edge (p11);
-    \node (p25) at (131.66,-76.41)  {}
-    edge (p24)
-    edge (p11)
-    edge (p20);
-    \node (p26) at (29.59,-139.18)  {}
-    edge (p3)
-    edge (p21)
-    edge (p2)
-    edge (p5);
-    \node (p28) at (-137.12,-66.58) {}
-    edge (p22)
-    edge (p9)
-    edge (p10)
-    edge (p16);
-    \node (p29) at (-84.94,-72.38)  {}
-    edge (p23)
-    edge (p22)
-    edge (p16)
-    edge (p28);
-    \node (p30) at (145.17,-37.49)  {}
-    edge (p25)
-    edge (p24);
-    \node (p31) at (102.20,-18.50)  {}
-    edge (p30)
-    edge (p25);
-  \end{tikzpicture}
-}
-\newcommand{\card}{
-  \begin{tikzpicture}
-    [every node/.style={rectangle,fill=white,minimum height=7pt,inner sep=0pt},
-      medium text/.style={text width=37.5mm},
-      slight text/.style={text width=30mm},
-      important text/.style={text width=41mm},
-      font=\tiny]
-    \begin{scope}[xshift=10mm]
-      \node[important text] (prefix) at (0, 4mm) {
-        \ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}
-      };
-      \node[important text] (name) at (0,0mm) {
-        \fontsize{9pt}{9pt}\selectfont
-        \textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}
-      };
-      \node[important text] (jobtitle) at (0, -4mm) {\jobtitle};
-    \end{scope}
-    \begin{scope}[xshift=8.5mm,yshift=-1.23mm]
-      \node[medium text] (mail) at (0, -10mm) {\email};
-      \node[medium text] (homepage) at (0, -13.25mm) {\homepage};
-    \end{scope}
-    \begin{scope}[xshift=53.5mm]
-      \node (qrcode) at (0,-9mm) {
-        \qrcode[height=24.2mm,level=Q]{gnunet://gns/\gns}
-      };
-      \node[scale=0.16] (logo) at (0,13mm) {\logo};
-    \end{scope}
-  \end{tikzpicture}
-}
-\begin{document}
-\addresslabel{\card}
-\end{document}
diff --git a/contrib/gns/gns-bcd.html b/contrib/gns/gns-bcd.html
deleted file mode 100644
index 2046d159f..000000000
--- a/contrib/gns/gns-bcd.html
+++ /dev/null
@@ -1,205 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-  <head>
-    <meta charset="utf-8"/>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Create your GNU Name System Business Card</title>
-    <style>
-      /* "Reset" values */
-      html {
-          box-sizing: border-box;
-      }
-      *, *:before, *:after {
-          box-sizing: inherit;
-      }
-      body {
-          font-family: system-ui, -apple-system, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", "Liberation Sans", sans-serif;
-          font-size: 1rem;
-          font-weight: 400;
-          line-height: 1.5;
-          background-color: #ffffff;
-          color: #212121;
-          margin: 0;
-      }
-      h1, h2, h3, h4, h5 {
-          margin-top: 0px;
-          margin-bottom: 0.5rem;
-          font-weight: 500;
-      }
-      p {
-          margin-top: 0px;
-          margin-bottom: 1rem;
-      }
-      fieldset{
-          margin: 0px;
-          padding: 0px;
-          border: 0px;
-          min-width: 0px;
-      }
-      label {
-          display: inline-block;
-      }
-      input {
-          margin: 0px;
-          font-family: inherit;
-          font-size: inherit;
-          line-height: inherit;
-      }
-      /* "Component" values */
-      .gns-container {
-          max-width: 100%;
-          margin-left: auto;
-          margin-right: auto;
-      }
-      .gns-header {
-          padding-top: 1rem;
-          padding-bottom: 0.25rem;
-      }
-      .gns-form-group {
-          margin-bottom: 1.5rem;
-      }
-      .gns-form-group:not(:last-child) {
-          border-top: 1px solid #cecece;
-      }
-      .gns-form-group > :first-child {
-          margin-top: 1rem;
-      }
-      .gns-field:not(:last-child) {
-          margin-bottom: 1rem;
-      }
-      .gns-label {
-          margin-bottom: 0.25rem;
-      }
-      .gns-text-input {
-          display: block;
-          width: 100%;
-          padding: 0.375rem 0.75rem;
-          color: #212121;
-          background-color: #ffffff;
-          border: 1px solid #ced4da;
-          border-radius: 0.20rem;
-      }
-      .gns-text-input:focus {
-          box-shadow: 0px 0px 9px rgba(102, 175, 233, 0.5);
-          border: 1px solid rgb(102, 175, 233);
-      }
-      .gns-button {
-          display: inline-block;
-          text-align: center;
-          text-decoraton: none;
-          vertical-align: middle;
-          cursor: pointer;
-          border: 1px solid transparent;
-          padding: 0.375rem 0.75rem;
-          border-radius: 0.20rem;
-      }
-      .gns-button:focus {
-          box-shadow: 0px 0px 9px rgba(200, 200, 200, 0.75);
-          border: 1px solid rgb(98, 98, 98);
-      }
-      @media (min-width: 576px) {
-          .gns-container {
-              max-width: 540px;
-          }
-      }
-      @media (min-width: 768px) {
-          .gns-container {
-              max-width: 720px;
-          }
-      }
-      @media (min-width: 992px) {
-          .gns-container {
-              max-width: 960px;
-          }
-      }
-      @media (min-width: 1200px) {
-          .gns-container {
-              max-width: 1140px;
-          }
-      }
-      @media (min-width: 1400px) {
-          .gns-container {
-              max-width: 1320px;
-          }
-      }
-    </style>
-  </head>
-  <body>
-    <div class="gns-container">
-      <div class="gns-header">
-        <h1>GNU Name System Business Card</h1>
-        <p>Please fill in the information below to generate your business
-          card.</p>
-      </div>
-      <form name="gnsinput" action="/submit/full" method="get">
-        <fieldset class="gns-form-group">
-          <div class="gns-field">
-            <label class="gns-label" for="prefix">Academic Title (prefix):</label>
-            <input class="gns-text-input" name="prefix" type="text">
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="name">Full Name:</label>
-            <input class="gns-text-input" name="name" type="text" required>
-          </div>
-        </fieldset>
-        <fieldset class="gns-form-group">
-          <div class="gns-field">
-            <label class="gns-label" for="phone">Phone:</label>
-            <input class="gns-text-input" name="phone" type="text">
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="fax">Fax:</label>
-            <input class="gns-text-input" name="fax" type="text">
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="email">E-mail:</label>
-            <input class="gns-text-input" name="email" type="email" required>
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="homepage">Homepage:</label>
-            <input class="gns-text-input" name="homepage" type="text" required>
-          </div>
-        </fieldset>
-        <fieldset class="gns-form-group">
-          <div class="gns-field">
-            <label class="gns-label" for="org">Organization:</label>
-            <input class="gns-text-input" name="org" type="text" required>
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="department">Department:</label>
-            <input class="gns-text-input" name="department" type="text">
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="subdepartment">Division:</label>
-            <input class="gns-text-input" name="subdepartment" type="text">
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="jobtitle">Jobtitle:</label>
-            <input class="gns-text-input" name="jobtitle" type="text">
-          </div>
-        </fieldset>
-        <fieldset class="gns-form-group">
-          <div class="gns-field">
-            <label class="gns-label" for="gpgfingerprint">GPG Fingerprint:</label>
-            <input class="gns-text-input" name="gpgfingerprint" type="text">
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="gnskey">GNS Public Key</label>
-            <input class="gns-text-input" name="gnskey" type="text" required>
-          </div>
-          <div class="gns-field">
-            <label class="gns-label" for="gnsnick">GNS Nickname:</label>
-            <input class="gns-text-input" name="gnsnick" type="text" required>
-          </div>
-        </fieldset>
-        <fieldset class="gns-form-group">
-          <div class="gns-field">
-            <input class="gns-button"
-                   type="submit"
-                   value="Generate Business Card">
-          </div>
-        </fieldset>
-      </form>
-    </div>
-  </body>
-</html>
diff --git a/contrib/gns/gns-bcd.tex b/contrib/gns/gns-bcd.tex
deleted file mode 100644
index de8c79de5..000000000
--- a/contrib/gns/gns-bcd.tex
+++ /dev/null
@@ -1,179 +0,0 @@
-\documentclass[a4paper,oneside]{scrartcl}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{tikz}
-\usepackage{ifthen}
-\usepackage{qrcode}
-\usepackage[newdimens]{labels}
-\LabelCols=2
-\LabelRows=5
-\LeftPageMargin=17.0mm
-\RightPageMargin=17.0mm
-\TopPageMargin=10.0mm
-\BottomPageMargin=10.0mm
-\InterLabelColumn=3.5mm
-\InterLabelRow=3.0mm
-\numberoflabels=10
-\renewcommand{\rmdefault}{phv}
-\renewcommand{\seriesdefault}{m}
-\renewcommand{\shapedefault}{n}
-\input{def.tex}
-\setlength\parindent{0pt}
-\newcommand{\logo}{
-  \begin{tikzpicture}
-    [every node/.style={circle,fill=black!73,inner sep=0pt,minimum size=2.2mm},
-      every edge/.style={draw,semithick},
-      x=1pt,y=1pt]
-    \node (p1)  at (21.57,-219.43)  {};
-    \node (p2)  at (41.44,-168.86)  {}
-    edge (p1);
-    \node (p3)  at (54.16,-130.86)  {}
-    edge (p2);
-    \node (p4)  at (-21.62,-219.43) {}
-    edge (p1);
-    \node (p5)  at (10.41,-158.90)  {}
-    edge (p2);
-    \node (p6)  at (-22.20,-173.21) {}
-    edge (p4);
-    \node (p9)  at (-147.32,-37.53) {};
-    \node (p10) at (-97.30,-18.50)  {}
-    edge (p9);
-    \node (p11) at (74.95,-89.64)   {}
-    edge (p3);
-    \node (p12) at (-0.20,-182.48)  {}
-    edge (p1)
-    edge (p4)
-    edge (p5)
-    edge (p6)
-    edge (p3);
-    \node (p13) at (18.79,-190.31)  {}
-    edge (p2)
-    edge (p1)
-    edge (p5)
-    edge (p4);
-    \node (p14) at (-46.77,-141.82) {}
-    edge (p6)
-    edge (p4);
-    \node (p15) at (-14.08,-141.91) {}
-    edge (p5)
-    edge (p6)
-    edge (p12);
-    \node (p16) at (-96.66,-90.02)  {};
-    \node (p17) at (-71.34,-90.78)  {}
-    edge (p16)
-    edge (p14);
-    \node (p18) at (-25.92,-109.84) {}
-    edge (p15)
-    edge (p17)
-    edge (p14);
-    \node (p19) at (-46.78,-94.06)  {}
-    edge (p18)
-    edge (p17)
-    edge (p14)
-    edge (p15);
-    \node (p20) at (51.95,-67.01)   {}
-    edge (p3)
-    edge (p11);
-    \node (p21) at (29.21,-103.63)  {}
-    edge (p11)
-    edge (p20)
-    edge (p3)
-    edge (p5)
-    edge (p2);
-    \node (p22) at (-116.84,-55.89) {}
-    edge (p10)
-    edge (p9);
-    \node (p23) at (-61.14,-62.16)  {}
-    edge (p18)
-    edge (p19)
-    edge (p17)
-    edge (p16);
-    \node (p24) at (107.08,-62.78)  {}
-    edge (p20)
-    edge (p11);
-    \node (p25) at (131.66,-76.41)  {}
-    edge (p24)
-    edge (p11)
-    edge (p20);
-    \node (p26) at (29.59,-139.18)  {}
-    edge (p3)
-    edge (p21)
-    edge (p2)
-    edge (p5);
-    \node (p28) at (-137.12,-66.58) {}
-    edge (p22)
-    edge (p9)
-    edge (p10)
-    edge (p16);
-    \node (p29) at (-84.94,-72.38)  {}
-    edge (p23)
-    edge (p22)
-    edge (p16)
-    edge (p28);
-    \node (p30) at (145.17,-37.49)  {}
-    edge (p25)
-    edge (p24);
-    \node (p31) at (102.20,-18.50)  {}
-    edge (p30)
-    edge (p25);
-  \end{tikzpicture}
-}
-\newcommand{\card}{
-  \begin{tikzpicture}
-    [every node/.style={rectangle,fill=white,minimum height=7pt,inner sep=0pt},
-      medium text/.style={text width=37.5mm},
-      slight text/.style={text width=30mm},
-      important text/.style={text width=40mm},
-      font=\tiny]
-    \begin{scope}[xshift=64.25mm]
-      \node[medium text] (organization) at (0,-21mm) {\org};
-      \ifthenelse{\equal{\department}{}}{}{
-        \node[medium text] (department) at (0,-23.5mm) {\department};
-      }
-      \ifthenelse{\equal{\subdepartment}{}}{}{
-        \node[medium text] (subdepartment) at (0,-26.5mm) {\subdepartment};
-      }
-      \ifthenelse{\equal{\phone}{}}{}{
-        \node[medium text] (tel label) at (0,-30mm) {Tel};
-        \node[slight text] (tel number) at (0.75mm,-30mm) {\phone};
-      }
-      \ifthenelse{\equal{\fax}{}}{}{
-        \node[medium text] (fax label) at (0,-32.5mm) {Fax};
-        \node[slight text] (fax number) at (0.75mm,-32.5mm) {\fax};
-      }
-      \node[medium text] (e-mail address) at (0,-35.5mm) {\email};
-      \node[medium text] (homepage address) at (0,-38mm) {\homepage};
-      \ifthenelse{\equal{\gpglineone}{}}{}{
-        \node[medium text] (gpg label) at (0,-41mm) {GPG Fingerprint};
-        \node[medium text] (gpg line one) at (0,-43.5mm) {\gpglineone};
-        \node[medium text] (gpg line two) at (0,-46mm) {\gpglinetwo};
-      }
-    \end{scope}
-    \node[scale=0.127] (logo) at (70mm, -10.5mm) {\logo};
-    \node (qrcode) at (20mm,-17mm) {
-      \qrcode[height=20mm,level=Q]{gnunet://gns/\gns}
-    };
-    \begin{scope}[xshift=24.25mm,yshift=-12mm]
-      \node[important text] (name prefix) at (0,-21mm) {
-        \ifthenelse{\equal{\prefix}{}}{}{\tiny \prefix}
-      };
-      \node[important text] (name) at (0,-24mm) {
-        \fontsize{8pt}{8pt}\selectfont
-        \textbf{\name}\ifthenelse{\equal{\suffix}{}}{}{, \tiny \suffix}
-      };
-      \ifthenelse{\equal{\jobtitle}{}}{}{
-        \node[important text] (job title) at (0,-29mm) {\jobtitle};
-      }
-    \end{scope}
-  \end{tikzpicture}
-}
-\begin{document}
-\addresslabel{\card}
-\end{document}
diff --git a/contrib/gnunet_infrastructure/handbook_pull.sh b/contrib/gnunet_infrastructure/handbook_pull.sh
deleted file mode 100755
index 16c7430ae..000000000
--- a/contrib/gnunet_infrastructure/handbook_pull.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-#
-# This essentially could be solved by:
-# git config pull.rebase true
-# git config rebase.autoStash true
-# but chances are that this is easy to
-# forget.
-# so execute this file on the server
-# instead of setting a git config.
-echo "Running git pull with autoStash and rebase"
-echo "If anything breaks in the future, delete"
-echo "and repeat - it was once considered to"
-echo "be responsible for non-trivial conflicts!"
-echo "We apply this because we need to build the"
-echo "handbook and tutorial without manual interventions."
-git pull --rebase --autostash
diff --git a/contrib/handbook b/contrib/handbook
new file mode 160000
+Subproject 7d66dc1695829f2511f8e8ecc227a64d73d1562
diff --git a/contrib/hellos/Makefile.am b/contrib/hellos/Makefile.am
deleted file mode 100644
index d2fc6b89e..000000000
--- a/contrib/hellos/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-pkghellodir= $(pkgdatadir)/hellos
-pkghello_DATA = \
-  Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0 
-EXTRA_DIST = $(pkghello_DATA)
diff --git a/contrib/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0 b/contrib/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0
deleted file mode 100644
index eeb6a15f7..000000000
--- a/contrib/hellos/Y924NSHMMZ1N1SQCE5TXF93ED6S6JY311K0QT86G9WJC68F6XVZ0
+++ /dev/null
Binary files differ
diff --git a/contrib/indent_pre-commit b/contrib/indent_pre-commit
deleted file mode 100755
index c67fcaf0c..000000000
--- a/contrib/indent_pre-commit
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# Run this script to indent the GNUnet code.  When run without arguments,
-# it indents the ENTIRE src/ tree.  Run with 'src/XXX' to indent the
-# src/XXX directory.
-#
-# This script is in the public domain.
-if test $# = 0
-then
- PATHS=src/
-else
- PATHS="$@"
-fi
-find $PATHS -name "*.c" -exec indent {} \;
-find $PATHS -name "*.h" -exec indent {} \;
-find $PATHS -name "*.c" -exec indent {} \;
-find $PATHS -name "*.h" -exec indent {} \;
-find $PATHS -name "*.c" -exec contrib/scripts/removetrailingwhitespace.py {} \;
-find $PATHS -name "*.h" -exec contrib/scripts/removetrailingwhitespace.py {} \;
-if test -n "`dos2unix -V | head -n1 | awk '{print $1 $2}'`"; then
-  find $PATHS -name "*.c" -exec dos2unix {} \;
-  find $PATHS -name "*.h" -exec dos2unix {} \;
-fi
diff --git a/contrib/meson.build b/contrib/meson.build
new file mode 100644
index 000000000..a1acbb32c
--- /dev/null
+++ b/contrib/meson.build
@@ -0,0 +1,6 @@
+subdir('conf')
+subdir('scripts')
+install_data('xdg-scheme-handler'/'gnunet-uri.desktop',
+             install_dir: get_option('datadir')/'applications')
diff --git a/contrib/netjail/netjail_core.sh b/contrib/netjail/netjail_core.sh
deleted file mode 100755
index da784fa5e..000000000
--- a/contrib/netjail/netjail_core.sh
+++ /dev/null
@@ -1,263 +0,0 @@
-#!/bin/sh
-# 
-PREFIX=${PPID:?must run from a parent process}
-# running with `sudo` is required to be
-# able running the actual commands as the
-# original user.
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-export RESULT=
-export NAMESPACE_NUM=0
-export INTERFACE_NUM=0
-netjail_next_namespace() {
-        local NUM=$NAMESPACE_NUM
-        NAMESPACE_NUM=$(($NAMESPACE_NUM + 1))
-        RESULT=$NUM
-}
-netjail_next_interface() {
-        local NUM=$INTERFACE_NUM
-        INTERFACE_NUM=$(($INTERFACE_NUM + 1))
-        RESULT=$NUM
-}
-netjail_opt() {
-        local OPT=$1
-        shift 1
-        INDEX=1
-        while [ $# -gt 0 ]; do
-                if [ "$1" = "$OPT" ]; then
-                        RESULT=$INDEX
-                        return
-                fi
-                INDEX=$(($INDEX + 1))
-                shift 1
-        done
-        RESULT=0
-}
-netjail_opts() {
-        local OPT=$1
-        local DEF=$2
-        shift 2
-        
-        while [ $# -gt 0 ]; do
-                if [ "$1" = "$OPT" ]; then
-                        printf "$2"
-                        return
-                fi
-                shift 1
-        done
-        
-        RESULT="$DEF"
-}
-netjail_check() {
-        local NODE_COUNT=$1
-        local FD_COUNT=$(($(ls /proc/self/fd | wc -w) - 4))
-        # quit if `$FD_COUNT < ($LOCAL_M * $GLOBAL_N * 2)`:
-        # the script also requires `sudo -C ($FD_COUNT + 4)`
-        # so you need 'Defaults closefrom_override' in the
-        # sudoers file.
-        if [ $FD_COUNT -lt $(($NODE_COUNT * 2)) ]; then
-                echo "File descriptors do not match requirements!" >&2
-                exit 1
-        fi
-}
-netjail_check_bin() {
-        local PROGRAM=$1
-        local MATCH=$(ls $(echo $PATH | tr ":" "\n") | grep "^$PROGRAM\$" | tr "\n" " " | awk '{ print $1 }')
-        # quit if the required binary $PROGRAM can not be
-        # found in the used $PATH.
-        if [ "$MATCH" != "$PROGRAM" ]; then
-                echo "Required binary not found: $PROGRAM" >&2
-                exit 1
-        fi
-}
-netjail_bridge() {
-        netjail_next_interface
-        local NUM=$RESULT
-        local BRIDGE=$(printf "%06x-%08x" $PREFIX $NUM)
-        ip link add $BRIDGE type bridge
-        ip link set dev $BRIDGE up
-        
-        RESULT=$BRIDGE
-}
-netjail_bridge_name() {
-        netjail_next_interface
-        local NUM=$RESULT
-        local BRIDGE=$(printf "%06x-%08x" $PREFIX $NUM)
-        
-        RESULT=$BRIDGE
-}
-netjail_bridge_clear() {
-        local BRIDGE=$1
-        ip link delete $BRIDGE
-}
-netjail_node() {
-        netjail_next_namespace
-        local NUM=$RESULT
-        local NODE=$(printf "%06x-%08x" $PREFIX $NUM)
-        ip netns add $NODE
-        
-        RESULT=$NODE
-}
-netjail_node_name() {
-        netjail_next_namespace
-        local NUM=$RESULT
-        local NODE=$(printf "%06x-%08x" $PREFIX $NUM)
-        
-        RESULT=$NODE
-}
-netjail_node_clear() {
-        local NODE=$1
-        ip netns delete $NODE
-}
-netjail_node_link_bridge() {
-        local NODE=$1
-        local BRIDGE=$2
-        local ADDRESS=$3
-        local MASK=$4
-        
-        netjail_next_interface
-        local NUM_IF=$RESULT
-        netjail_next_interface
-        local NUM_BR=$RESULT
-        
-        local LINK_IF=$(printf "%06x-%08x" $PREFIX $NUM_IF)
-        local LINK_BR=$(printf "%06x-%08x" $PREFIX $NUM_BR)
-        ip link add $LINK_IF type veth peer name $LINK_BR
-        ip link set $LINK_IF netns $NODE
-        ip link set $LINK_BR master $BRIDGE
-        ip -n $NODE addr add "$ADDRESS/$MASK" broadcast + dev $LINK_IF
-        ip -n $NODE link set $LINK_IF up
-        ip -n $NODE link set up dev lo
-        ip link set $LINK_BR up
-        
-        RESULT=$LINK_BR
-}
-netjail_node_link_bridge_name() {
-        
-        netjail_next_interface
-        netjail_next_interface
-        local NUM_BR=$RESULT
-        
-        local LINK_BR=$(printf "%06x-%08x" $PREFIX $NUM_BR)
-        
-        RESULT=$LINK_BR
-}
-netjail_node_unlink_bridge() {
-        local LINK_BR=$1
-        ip link delete $LINK_BR
-}
-netjail_node_add_nat() {
-        local NODE=$1
-        local ADDRESS=$2
-        local MASK=$3
-    ip netns exec $NODE nft add table nat
-    ip netns exec $NODE nft add chain nat postrouting { type nat hook postrouting priority 0 \; }
-    ip netns exec $NODE nft add rule ip nat postrouting ip saddr "$ADDRESS/$MASK" counter masquerade
-        # ip netns exec $NODE iptables -t nat -A POSTROUTING -s "$ADDRESS/$MASK" -j MASQUERADE
-}
-netjail_node_add_default() {
-        local NODE=$1
-        local ADDRESS=$2
-        ip -n $NODE route add default via $ADDRESS
-}
-netjail_node_exec() {
-    JAILOR=${SUDO_USER:?must run in sudo}
-        local NODE=$1
-        local FD_IN=$2
-        local FD_OUT=$3
-        shift 3
-        ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN
-}
-netjail_node_exec_without_fds() {
-    JAILOR=${SUDO_USER:?must run in sudo}
-        NODE=$1
-        shift 1
-        ip netns exec $NODE sudo -u $JAILOR -- $@
-}
-netjail_node_exec_without_fds_and_sudo() {
-        NODE=$1
-        shift 1
-        ip netns exec $NODE $@
-}
-netjail_kill() {
-        local PID=$1
-        local MATCH=$(ps --pid $PID | awk "{ if ( \$1 == $PID ) { print \$1 } }" | wc -l)
-        if [ $MATCH -gt 0 ]; then
-                kill -n 19 $PID
-                for CHILD in $(ps -o pid,ppid -ax | awk "{ if ( \$2 == $PID ) { print \$1 } }"); do
-                        netjail_kill $CHILD
-                done
-                kill $PID
-        fi
-}
-netjail_killall() {
-        if [ $# -gt 0 ]; then
-                local PIDS=$1
-                for PID in $PIDS; do
-                        netjail_kill $PID
-                done
-        fi
-}
-netjail_waitall() {
-        if [ $# -gt 0 ]; then
-                local PIDS=$1
-                for PID in $PIDS; do
-                        wait $PID
-                done
-        fi
-}
diff --git a/contrib/netjail/netjail_exec.sh b/contrib/netjail/netjail_exec.sh
deleted file mode 100755
index fa68d90d4..000000000
--- a/contrib/netjail/netjail_exec.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-. "$(dirname $0)/netjail_core.sh"
-set -eu
-set -x
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-M=$1
-N=$2
-NODE=$6
-#netjail_node_exec_without_fds_and_sudo $NODE valgrind --leak-check=full --track-origins=yes --trace-children=yes $3 $4 $5 $1 $2 $7 $8
-netjail_node_exec_without_fds_and_sudo $NODE $3 $4 $5 $1 $2 $7 $8
diff --git a/contrib/netjail/netjail_start.sh b/contrib/netjail/netjail_start.sh
deleted file mode 100755
index e2d5fd634..000000000
--- a/contrib/netjail/netjail_start.sh
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-. "$(dirname $0)/netjail_core.sh"
-. "$(dirname $0)/topo.sh"
-set -eu
-set -x
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-filename=$1
-PREFIX=$2
-readfile=$3
-BROADCAST=0
-if [ $readfile -eq 0 ]
-then
-    read_topology_string "$filename"
-else
-    echo read file
-    read_topology $filename
-fi
-shift 2
-LOCAL_GROUP="192.168.15"
-GLOBAL_GROUP="92.68.150"
-KNOWN_GROUP="92.68.151"
-if [ $BROADCAST -eq 0  ]; then
-   PORT="60002"
-else
-    PORT="2086"
-fi
-echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/16]"
-netjail_bridge
-NETWORK_NET=$RESULT
-for X in $(seq $KNOWN); do
-        netjail_node
-        KNOWN_NODES[$X]=$RESULT
-        netjail_node_link_bridge ${KNOWN_NODES[$X]} $NETWORK_NET "$KNOWN_GROUP.$X" 16
-        KNOWN_LINKS[$X]=$RESULT
-done
-declare -A NODES
-declare -A NODE_LINKS
-for N in $(seq $GLOBAL_N); do
-        netjail_node
-        ROUTERS[$N]=$RESULT
-        netjail_node_link_bridge ${ROUTERS[$N]} $NETWORK_NET "$GLOBAL_GROUP.$N" 16
-        NETWORK_LINKS[$N]=$RESULT
-        netjail_bridge
-        ROUTER_NETS[$N]=$RESULT
-        
-        for M in $(seq $LOCAL_M); do
-                netjail_node
-                NODES[$N,$M]=$RESULT
-                netjail_node_link_bridge ${NODES[$N,$M]} ${ROUTER_NETS[$N]} "$LOCAL_GROUP.$M" 24
-                NODE_LINKS[$N,$M]=$RESULT
-        done
-        ROUTER_ADDR="$LOCAL_GROUP.$(($LOCAL_M+1))"
-        netjail_node_link_bridge ${ROUTERS[$N]} ${ROUTER_NETS[$N]} $ROUTER_ADDR 24
-        ROUTER_LINKS[$N]=$RESULT
-        
-        netjail_node_add_nat ${ROUTERS[$N]} $ROUTER_ADDR 24
-        
-        for M in $(seq $LOCAL_M); do
-                netjail_node_add_default ${NODES[$N,$M]} $ROUTER_ADDR
-        done
-    # TODO Topology configuration must be enhanced to configure forwarding to more than one subnet node via different ports.
-    
-    if [ "1" == "${R_TCP[$N]}" ]
-    then
-        #ip netns exec ${ROUTERS[$N]} nft add rule ip nat prerouting ip daddr $GLOBAL_GROUP.$N tcp dport 60002 counter dnat to $LOCAL_GROUP.1
-        #ip netns exec ${ROUTERS[$N]} nft add rule ip filter FORWARD ip daddr $LOCAL_GROUP.1 ct state new,related,established  counter accept
-        ip netns exec ${ROUTERS[$N]} iptables -t nat -A PREROUTING -p tcp -d $GLOBAL_GROUP.$N --dport 60002 -j DNAT --to $LOCAL_GROUP.1
-        ip netns exec ${ROUTERS[$N]} iptables -A FORWARD -d $LOCAL_GROUP.1  -m state --state NEW,RELATED,ESTABLISHED -j ACCEPT
-    fi
-    if [ "1" == "${R_UDP[$N]}" ]
-    then
-        #ip netns exec ${ROUTERS[$N]} nft add rule ip nat prerouting ip daddr $GLOBAL_GROUP.$N udp dport $PORT counter dnat to $LOCAL_GROUP.1
-        #ip netns exec ${ROUTERS[$N]} nft add rule ip filter FORWARD ip daddr $LOCAL_GROUP.1 ct state new,related,established  counter accept
-        ip netns exec ${ROUTERS[$N]} iptables -t nat -A PREROUTING -p udp -d $GLOBAL_GROUP.$N --dport $PORT -j DNAT --to $LOCAL_GROUP.1
-        ip netns exec ${ROUTERS[$N]} iptables -A FORWARD -d $LOCAL_GROUP.1  -m state --state NEW,RELATED,ESTABLISHED -j ACCEPT
-    fi
-done
diff --git a/contrib/netjail/netjail_stop.sh b/contrib/netjail/netjail_stop.sh
deleted file mode 100755
index c8739dc94..000000000
--- a/contrib/netjail/netjail_stop.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-. "$(dirname $0)/netjail_core.sh"
-. "$(dirname $0)/topo.sh"
-set -eu
-set -x
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-filename=$1
-PREFIX=$2
-readfile=$3
-if [ $readfile -eq 0 ]
-then
-    read_topology_string $filename
-else
-    read_topology $filename
-fi
-declare -A NODES
-declare -A NODE_LINKS
-netjail_bridge_name
-NETWORK_NET=$RESULT
-for X in $(seq $KNOWN); do
-    netjail_node_name
-        KNOWN_NODES[$X]=$RESULT
-    netjail_node_link_bridge_name
-    KNOWN_LINKS[$X]=$RESULT
-    netjail_node_unlink_bridge ${KNOWN_LINKS[$X]}
-        netjail_node_clear ${KNOWN_NODES[$X]}
-done
-for N in $(seq $GLOBAL_N); do
-    netjail_node_name
-        ROUTERS[$N]=$RESULT
-    netjail_node_link_bridge_name
-    NETWORK_LINKS[$N]=$RESULT
-    netjail_bridge_name
-    ROUTER_NETS[$N]=$RESULT
-    netjail_node_link_bridge_name
-    ROUTER_LINKS[$N]=$RESULT
-    netjail_node_unlink_bridge ${ROUTER_LINKS[$N]}
-    
-        for M in $(seq $LOCAL_M); do
-        netjail_node_name
-                NODES[$N,$M]=$RESULT
-        netjail_node_link_bridge_name
-        NODE_LINKS[$N,$M]=$RESULT
-                netjail_node_unlink_bridge ${NODE_LINKS[$N,$M]}
-                netjail_node_clear ${NODES[$N,$M]}
-        done
-        
-        netjail_bridge_clear ${ROUTER_NETS[$N]}
-        netjail_node_unlink_bridge ${NETWORK_LINKS[$N]}
-        netjail_node_clear ${ROUTERS[$N]}
-done
-netjail_bridge_clear $NETWORK_NET
-echo "Done"
diff --git a/contrib/netjail/topo.sh b/contrib/netjail/topo.sh
deleted file mode 100755
index d7586d425..000000000
--- a/contrib/netjail/topo.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-declare -A K_PLUGIN
-declare -A R_TCP
-declare -A R_UDP
-declare -A P_PLUGIN
-extract_attributes()
-{
-    line_key=$1
-    line=$2
-    
-    if [ "$line_key" = "P" ]
-    then
-        n=$(echo $line|cut -d \| -f 1|awk -F: '{print $2}')
-        echo $n
-        m=$(echo $line|cut -d \| -f 1|awk -F: '{print $3}')
-        echo $m
-    else
-        number=$(echo $line|cut -d \| -f 1| cut -c 2-|cut -d : -f 2 )
-        echo $number
-    fi
-    nf=$(echo $line|awk -F: '{print NF}')
-    for ((i=2;i<=$nf;i++))
-    do
-        entry=$(echo $line |awk -v i=$i -F\| '{print $i}')
-        key=$(echo $entry|cut -d { -f 2|cut -d } -f 1|cut -d : -f 1)
-        value=$(echo $entry|cut -d { -f 2|cut -d } -f 1|cut -d : -f 2)
-        if [ "$key" = "tcp_port" ]
-        then
-            echo tcp port: $value
-            R_TCP[$number]=$value
-        elif [ "$key" = "udp_port" ]
-        then
-            echo udp port: $value
-            R_UDP[$number]=$value
-        elif [ "$key" = "plugin" ]
-        then
-            echo plugin: $value
-            echo $line_key
-            if [ "$line_key" = "P" ]
-            then
-                P_PLUGIN[$n,$m]=$value
-                echo $n $m ${P_PLUGIN[$n,$m]}
-            elif [ "$line_key" = "K" ]
-            then
-                K_PLUGIN[$number]=$value
-            fi
-        fi
-    done
-}
-parse_line(){
-    line=$1
-    echo $line
-    key=$(cut -c -1 <<< $line)
-    if [ "$key" = "M" ]
-    then
-        LOCAL_M=$(cut -d : -f 2 <<< $line)
-        echo $LOCAL_M
-    elif [ "$key" = "N" ]
-    then
-        GLOBAL_N=$(cut -d : -f 2 <<< $line)
-        echo $GLOBAL_N
-    for ((i=1;i<=$GLOBAL_N;i++))
-    do
-        R_TCP[$i]=0
-        R_UDP[$i]=0
-    done    
-    elif [ "$key" = "X" ]
-    then
-        KNOWN=$(cut -d : -f 2 <<< $line)
-        echo $KNOWN
-    elif [ "$key" = "T" ]
-    then
-        PLUGIN=$(cut -d : -f 2 <<< $line)
-        echo $PLUGIN
-    elif [ "$key" = "B" ]
-    then
-        BROADCAST=$(cut -d : -f 2 <<< $line)
-        echo $BROADCAST
-    elif [ "$key" = "K" ]
-    then
-        echo know node
-        extract_attributes $key $line
-    elif [ "$key" = "R" ]
-    then
-        echo router
-        extract_attributes $key $line
-    elif [ "$key" = "P" ]
-    then
-        echo node
-        extract_attributes $key $line
-    fi
-}
-read_topology_string(){
-    string=$1
-    IFS=' ' read -r -a array <<< $string
-    for element in "${array[@]}"
-    do
-        echo $element
-        parse_line $element
-    done
-}
-read_topology(){
-    local filename=$1
-    while read line; do
-        # reading each line
-        parse_line $line
-    done < $filename
-}
diff --git a/contrib/packages/arch/gnunet-git/.SRCINFO b/contrib/packages/arch/gnunet-git/.SRCINFO
index 82a649530..682e69576 100644
--- a/contrib/packages/arch/gnunet-git/.SRCINFO
+++ b/contrib/packages/arch/gnunet-git/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by makepkg 6.0.1
-# Fri Aug  5 01:36:05 UTC 2022
+# Mon Sep 26 21:21:28 UTC 2022
 pkgbase = gnunet-git
        pkgdesc = A framework for secure peer-to-peer networking
-        pkgver = 0.17.2.r20.g0780c69e9
+        pkgver = 0.17.6.r4.g7bf2f8f59
        pkgrel = 1
        url = http://gnunet.org
        install = gnunet.install
@@ -23,10 +23,10 @@ pkgbase = gnunet-git
        makedepends = recutils
        depends = brotli
        depends = gettext
-        depends = gnurl
        depends = gnutls
        depends = iptables
        depends = jansson
+        depends = libcurl-gnutls
        depends = libextractor
        depends = libgcrypt
        depends = libidn2
diff --git a/contrib/packages/arch/gnunet-git/PKGBUILD b/contrib/packages/arch/gnunet-git/PKGBUILD
index c0fed77e5..17d7e057f 100644
--- a/contrib/packages/arch/gnunet-git/PKGBUILD
+++ b/contrib/packages/arch/gnunet-git/PKGBUILD
@@ -6,7 +6,7 @@
 _appname='gnunet'
 pkgname="${_appname}-git"
-pkgver=0.17.2.r20.g0780c69e9
+pkgver=0.17.6.r4.g7bf2f8f59
 pkgrel=1
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ url="http://${_appname}.org"
 license=('AGPL')
 conflicts=("${_appname}" "${_appname}-bin")
 provides=("${_appname}")
-depends=('brotli' 'gettext' 'gnurl' 'gnutls' 'iptables' 'jansson'
+depends=('brotli' 'gettext' 'gnutls' 'iptables' 'jansson' 'libcurl-gnutls'
         'libextractor' 'libgcrypt' 'libidn2' 'libmicrohttpd' 'libsodium'
         'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which'
         'zlib')
diff --git a/contrib/packages/arch/gnunet/.SRCINFO b/contrib/packages/arch/gnunet/.SRCINFO
index deb93d6ad..19df8d63f 100644
--- a/contrib/packages/arch/gnunet/.SRCINFO
+++ b/contrib/packages/arch/gnunet/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = gnunet
        pkgdesc = A framework for secure peer-to-peer networking
-        pkgver = 0.17.3
+        pkgver = 0.17.6
        pkgrel = 1
        url = http://gnunet.org
        install = gnunet.install
@@ -18,10 +18,10 @@ pkgbase = gnunet
        makedepends = python-sphinx_rtd_theme
        depends = brotli
        depends = gettext
-        depends = gnurl
        depends = gnutls
        depends = iptables
        depends = jansson
+        depends = libcurl-gnutls
        depends = libextractor
        depends = libgcrypt
        depends = libidn2
@@ -52,15 +52,15 @@ pkgbase = gnunet
        conflicts = gnunet-git
        conflicts = gnunet-bin
        backup = etc/gnunet.conf
-        source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.3.tar.gz
+        source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.6.tar.gz
-        source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.3.tar.gz.sig
+        source = ftp://ftp.gnu.org/gnu/gnunet/gnunet-0.17.6.tar.gz.sig
        source = gnunet-system.service
        source = gnunet.sysusers
        source = gnunet.tmpfiles
        source = gnunet-user.conf
        source = gnunet-user.service
        validpgpkeys = 3D11063C10F98D14BD24D1470B0998EF86F59B6A
-        sha256sums = 74c767b8d0c34f60ddfa4e77a1657365d34c484b5ffaeb3796e3f520a9d50c9e
+        sha256sums = 249358ef3b10ce99810781fedaec526a6eab943c120e4bba096aedf91c1afc40
        sha256sums = SKIP
        sha256sums = 163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262
        sha256sums = 66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755
diff --git a/contrib/packages/arch/gnunet/PKGBUILD b/contrib/packages/arch/gnunet/PKGBUILD
index d04989715..1cef4dcec 100644
--- a/contrib/packages/arch/gnunet/PKGBUILD
+++ b/contrib/packages/arch/gnunet/PKGBUILD
@@ -5,14 +5,14 @@
 # Contributor: wahnby <wahnby AT yahoo DOT fr>
 pkgname='gnunet'
-pkgver='0.17.3'
+pkgver='0.17.6'
 pkgrel=1
 pkgdesc='A framework for secure peer-to-peer networking'
 arch=('i686' 'x86_64')
 url="http://${pkgname}.org"
 license=('AGPL')
 conflicts=("${pkgname}-git" "${pkgname}-bin")
-depends=('brotli' 'gettext' 'gnurl' 'gnutls' 'iptables' 'jansson'
+depends=('brotli' 'gettext' 'gnutls' 'iptables' 'jansson' 'libcurl-gnutls'
         'libextractor' 'libgcrypt' 'libidn2' 'libmicrohttpd' 'libsodium'
         'libtool' 'libunistring' 'miniupnpc' 'nss' 'openssl' 'sqlite' 'which'
         'zlib')
@@ -41,7 +41,7 @@ source=("ftp://ftp.gnu.org/gnu/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}
        "${pkgname}-user.service")
 install="${pkgname}.install"
 validpgpkeys=('3D11063C10F98D14BD24D1470B0998EF86F59B6A')
-sha256sums=('74c767b8d0c34f60ddfa4e77a1657365d34c484b5ffaeb3796e3f520a9d50c9e'
+sha256sums=('249358ef3b10ce99810781fedaec526a6eab943c120e4bba096aedf91c1afc40'
            'SKIP'
            '163818b89beddcaf78937daba5bdf0ae060b2975de0731aa13d1ccdd813cf262'
            '66299dbbdd0219d2f5f0520e69fc094f38f789724d973c2f63a421257ea4f755'
diff --git a/contrib/packages/fedora/10-dns2gns.sh b/contrib/packages/fedora/10-dns2gns.sh
new file mode 100644
index 000000000..b652a9c0c
--- /dev/null
+++ b/contrib/packages/fedora/10-dns2gns.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+interface=$1
+status=$2
+do_it=$(gnunet-config -s dns2gns -o ENABLE_RESOLVECTL_NMDISPATCHER -c /etc/gnunet.conf)
+if [ $? != 0 ]; then
+  exit 1
+fi
+if [ $do_it = "NO" ]; then
+  echo "Setting DNS2GNS through resolvectl disabled."
+  exit 1
+fi
+case $status in
+  up)
+    if nc -u -z 127.0.0.1 5353; then
+      # Note: We add quad 9 as a fallback in case our service is down.
+      dns2gns=$(gnunet-config -s dns2gns -o BIND_TO)
+      if [ $? != 0 ]; then
+        exit 1
+      fi
+      dns2gns6=$(gnunet-config -s dns2gns -o BIND_TO6)
+      if [ $? != 0 ]; then
+        exit 1
+      fi
+      port=$(gnunet-config -s dns2gns -o PORT)
+      if [ $? != 0 ]; then
+        exit 1
+      fi
+      olddns=$(resolvectl status $interface | grep "DNS Servers" | cut -d':' -f2-)
+      if [ $? == 0 ]; then
+        #echo "Setting to $dns2gns:$port [$dns2gns6]:$port $olddns 9.9.9.9"
+        #resolvectl dns $interface $dns2gns:$port [$dns2gns6]:$port $olddns 9.9.9.9
+        echo "Setting to $dns2gns:$port [$dns2gns6]:$port"
+        resolvectl dns $interface $dns2gns:$port [$dns2gns6]:$port
+      else
+        exit 1
+      fi
+    fi
+  ;;
+  down)
+  ;;
+esac
diff --git a/contrib/packages/fedora/gnunet-system.conf b/contrib/packages/fedora/gnunet-system.conf
new file mode 100644
index 000000000..a0b99dfeb
--- /dev/null
+++ b/contrib/packages/fedora/gnunet-system.conf
@@ -0,0 +1,12 @@
+[path]
+GNUNET_HOME = /var/lib/gnunet/
+GNUNET_DATA_HOME = /var/lib/gnunet/data/
+GNUNET_RUNTIME_DIR = /var/run/gnunet/
+[arm]
+START_SYSTEM_SERVICES = YES
+START_USER_SERVICES = NO
+OPTIONS = -l /var/log/gnunet.log
+[dns2gns]
+ENABLE_RESOLVECTL_NMDISPATCHER = YES
diff --git a/contrib/packages/fedora/gnunet-user.service b/contrib/packages/fedora/gnunet-user.service
new file mode 100644
index 000000000..c9d3be0ad
--- /dev/null
+++ b/contrib/packages/fedora/gnunet-user.service
@@ -0,0 +1,11 @@
+# Typically to be place into /usr/lib/systemd/user/gnunet.service
+[Unit]
+Description=GNUnet user service
+After=network.target
+[Service]
+Type=simple
+ExecStart=/usr/lib/gnunet/libexec/gnunet-service-arm -c ~/.config/gnunet.conf
+[Install]
+WantedBy=multi-user.target
diff --git a/contrib/packages/fedora/gnunet.service b/contrib/packages/fedora/gnunet.service
new file mode 100644
index 000000000..daa38a046
--- /dev/null
+++ b/contrib/packages/fedora/gnunet.service
@@ -0,0 +1,14 @@
+# Typically placed into /usr/lib/systemd/system/gnunet.service
+[Unit]
+Description=GNUnet system service
+After=network.target
+[Service]
+Type=simple
+User=gnunet
+ExecStart=/usr/lib/gnunet/libexec/gnunet-service-arm -c /etc/gnunet.conf
+StateDirectory=gnunet
+StateDirectoryMode=0700
+[Install]
+WantedBy=multi-user.target
diff --git a/contrib/guix.README b/contrib/packages/guix/guix.README
index 1e8bd3126..1e8bd3126 100644
--- a/contrib/guix.README
+++ b/contrib/packages/guix/guix.README
diff --git a/contrib/guix.scm b/contrib/packages/guix/guix.scm
index 4376d1ef5..4376d1ef5 100644
--- a/contrib/guix.scm
+++ b/contrib/packages/guix/guix.scm
diff --git a/contrib/scripts/Makefile.am b/contrib/scripts/Makefile.am
index 756119ada..204167e82 100644
--- a/contrib/scripts/Makefile.am
+++ b/contrib/scripts/Makefile.am
@@ -1,5 +1,6 @@
 # This Makefile.am is in the public domain
 AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
+libexecdir= $(pkglibdir)/libexec/
 SUBDIRS = gnunet-logread
@@ -21,7 +22,10 @@ noinst_SCRIPTS = \
  $(awkSCRIPTS)
 bin_SCRIPTS = \
-  gnunet-bugreport \
+  gnunet-bugreport
+# This script is not documented and its usage is quite uncommon.
+libexec_SCRIPTS = \
  gnunet-suidfix
 EXTRA_DIST = \
@@ -39,14 +43,11 @@ EXTRA_DIST = \
  find_typedefs.py \
  pydmesg \
  visualize_stats.sh \
-  changelog_delta.sh \
  debug \
  build_cscope.sh \
  lint/lint-man.sh \
  lint/lint-python.sh \
  revisionary.sh \
-  netjail/netjail_core.sh \
-  netjail/netjail_setup_internet.sh \
  regression.sh \
  doc/texinfo-hacks.el \
  afferify \
@@ -71,11 +72,11 @@ CLEANFILES = \
 SUFFIXES = .py.in .py
 .py.in.py:
-        $(AWK) -v py="$(PYTHON)" -f $(top_srcdir)/bin/dosubst.awk < $< > $@
+        $(AWK) -v py="$(PYTHON)" -f $(top_srcdir)/scripts/dosubst.awk < $< > $@
        chmod +x $@
 if HAVE_AWK
 check-texinfo.awk: check-texinfo.awk.in Makefile
-        $(AWK) -v awkay="$(AWK_BINARY)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/check-texinfo.awk.in > check-texinfo.awk
+        $(AWK) -v awkay="$(AWK_BINARY)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/check-texinfo.awk.in > check-texinfo.awk
        chmod +x check-texinfo.awk
 endif
diff --git a/contrib/scripts/changelog_delta.sh b/contrib/scripts/changelog_delta.sh
deleted file mode 100644
index f115f1ef1..000000000
--- a/contrib/scripts/changelog_delta.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-LASTHASH=$(head -n1 ChangeLog | cut -d " " -f 7 | tr -d \( | tr -d \))
-git log --invert-grep --grep="^-" --no-merges --no-color --format="%aD (%h)%n%s - %cN%n" $LASTHASH..HEAD
diff --git a/contrib/scripts/doc/warningfilter.py b/contrib/scripts/doc/warningfilter.py
new file mode 100755
index 000000000..31ac5865c
--- /dev/null
+++ b/contrib/scripts/doc/warningfilter.py
@@ -0,0 +1,134 @@
+#!/usr/bin/env python3
+"""
+Filters and processes warnings generated by Doxygen, which are
+annoyingly inconsistent and verbose, for greater readability.
+(Neo)vim commands to go to the file and linenumber listed on a 
+line, in the reports this program generates:
+    :exe "let linenumber =" split(getline("."))[1]
+    :exe "edit" fnameescape(split(getline("."))[0]) "|" linenumber
+It's easy to put a workflow together to clear up redundant doc 
+comments (which generate "multiple @param docs" warnings), using
+simple vim commands to move the cursor and close buffers, Neovim's 
+support for the Language Server Protocol or related tooling, and 
+the command shown above.
+A useful sequence, for rapidly deleting a doc comment from its last
+line, is, in normal mode, `$v%ddd`.
+For setting up LSP integration in Neovim, refer to the lsp_config
+plugin. 
+You may additionally need to generate compile_commands.json in the 
+repository root, to allow the language server to find everything. 
+This can be done using Bear (found at https://github.com/rizsotto/Bear).
+@author: willow <willow@howhill.com>
+"""
+import argparse as ap
+import re
+# Regular expression construction
+def sep_re(field, separator):
+    "Constructs regex for a list"
+    return rf"{field}(?:{separator}{field})*"
+# File names and paths
+fileclass = r"[\w-]"
+filename = rf"{fileclass}+"
+# filename = rf"(/{fileclass}+)+\.\w"
+filepath = rf"{sep_re(filename, '/')}\.(?:\w+)"
+main_match = rf"(?P<path>/{filepath}|\[generated\]):(?P<linenumber>\d+): warning:"
+# Symbols
+type_name = rf"(?:const )?(?:unsigned (?:long )?|struct |enum )?(?:\w+)(?: \*?const)? \*{{0,3}}"
+var_def = rf"{type_name}\w+(?:\[(?:\(\d+/\d+\))?\])?"
+func_params = rf"\({sep_re(var_def, ', ')}(?:,\.\.\.)?\)"
+simple_name = r"\w+"
+func_name = simple_name
+verbose_name = rf"{sep_re(simple_name, ' ')}"
+command_re = "(?:</[^>]+>|\\\w+)"
+macro_params = rf"\({sep_re(simple_name, ', ')}(?:,\.\.\.)?\)"
+matches = {
+    "not an input @file": re.compile(rf"{main_match} the name '(?P<name>{filepath}|{simple_name})' supplied as the argument in the \\file statement is not an input file"),
+    "multiple @param docs": re.compile(rf"{main_match} argument '(?P<arg_name>\w+)' from the argument list of ({func_name}) has multiple @param documentation sections"),
+    "undocumented param": re.compile(rf"{main_match} The following parameters? of ({func_name})(?:{func_params}|{macro_params}) (?:is|are) not documented:"),
+    "undocumented param (name)": re.compile(r"  parameter '([\w.]+)'"),
+    "explicit link not resolved": re.compile(rf"{main_match} explicit link request to '(\w+(?:\(\))?)' could not be resolved"),
+    "unknown command": re.compile(rf"{main_match} Found unknown command '(\\\w+)'"),
+    "missing argument": re.compile(rf"{main_match} argument '(\w+)' of command @param is not found in the argument list of ({func_name})(?:{func_params}|{macro_params})"),
+    "eof inside group": re.compile(rf"{main_match} end of file while inside a group"),
+    "eof inside comment": re.compile(rf"{main_match} Reached end of file while still inside a \(nested\) comment. Nesting level \d+ \(probable line reference: (\d+)\)"),
+    "eof inside code block": re.compile(rf"{main_match} reached end of file while inside a 'code' block!"),
+    "eof inside code block (line 2)": re.compile(rf"The command that should end the block seems to be missing!"),
+    "title mismatch": re.compile(rf"{main_match} group (?P<group_id>\w+): ignoring title \"(?P<new_title>{verbose_name})\" that does not match old title \"(?P<old_title>{verbose_name})\""),
+    "end of comment expecting command": re.compile(rf"{main_match} end of comment block while expecting command ({command_re})"),
+    "no matching tag": re.compile(rf"{main_match} found </(?P<tag>[^>]+)> tag without matching <(?P=tag)>"),
+    "documented empty return type": re.compile(rf"{main_match} documented empty return type of {func_name}"),
+    "unsupported tag": re.compile(rf"{main_match} Unsupported xml/html tag <(?P<tag>[^>]+)> found"),
+    "expected whitespace after command": re.compile(rf"{main_match} expected whitespace after \\(?P<command>\w+) command"),
+    "illegal command": re.compile(rf"{main_match} Illegal command (?P<illegal_cmd>(?:@|\\)\w+) as part of a \\(?P<command>\w+) command"),
+    "undeclared symbol": re.compile(rf"{main_match} documented symbol '(\w+)' was not declared or defined\."),
+    "nameless member": re.compile(rf"{main_match} member with no name found."),
+    "end of empty list": re.compile(rf"{main_match} End of list marker found without any preceding list items"),
+    "blank": re.compile(rf"^\s*$"),
+#    "": re.compile(rf"{main_match} "),
+}
+parser_choices = set(matches.keys()) - {"blank", 
+                                        "eof inside code block (line 2)",
+                                        "undocumented param (name)"}
+parser = ap.ArgumentParser()
+parser.add_argument("filename")
+parser.add_argument("--summary", "-s", action="store_true")
+parser.add_argument("--key", "-k", choices=parser_choices, action="append", dest="keys")
+args = parser.parse_args()
+sorted_lines = {k:[] for k in matches.keys()}
+unsorted_lines = []
+with open(args.filename, "r") as file:
+    for line in file.readlines():
+        for key, value in matches.items():
+            if match := value.match(line):
+                sorted_lines[key].append(match)
+                break
+        else:
+            unsorted_lines.append(line.strip("\n"))
+processed_lines = {k: [" ".join(g for g in match.groups())
+                       for match in matches]
+                   for k, matches in sorted_lines.items()}
+# Combining multiline warnings
+processed_lines["undocumented param"] = [
+    l1+" "+l2 for l1, l2 in zip(processed_lines["undocumented param"],
+                                processed_lines["undocumented param (name)"]) 
+]
+# Removing chaff
+del processed_lines["blank"]
+del processed_lines["eof inside code block (line 2)"]
+del processed_lines["undocumented param (name)"]
+# Preparing count dictionary and summarising the results
+counts = {k: len(v) for k, v in processed_lines.items()}
+if args.summary:
+    for k, v in counts.items():
+        print(k+":", v)
+    print("")
+if args.keys is not None:
+    for key in args.keys:
+        print(f"{key}: {counts[key]}")
+        for line in processed_lines[key]:
+            print(line)
+        print("")
diff --git a/contrib/scripts/generate-release-triplet.sh b/contrib/scripts/generate-release-triplet.sh
new file mode 100755
index 000000000..7dc890dc0
--- /dev/null
+++ b/contrib/scripts/generate-release-triplet.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+PACKAGE=$1
+VERSION=$2
+cat << EOF >> $PACKAGE-$VERSION.directive
+version: 1.2
+directory: gnunet
+filename: $PACKAGE-$VERSION.tar.gz
+symlink: $PACKAGE-$VERSION.tar.gz $PACKAGE-latest.tar.gz
+EOF
+gpg --clearsign $PACKAGE-$VERSION.directive
+gpg -b $PACKAGE-$VERSION.tar.gz
+exit
+ftp -inv ftp-upload.gnu.org <<EOF
+user anonymous
+cd incoming/ftp
+mput $PACKAGE-$VERSION.tar.gz $PACKAGE-$VERSION.tar.gz.sig $PACKAGE-$VERSION.tar.gz.directive.asc
+bye
+EOF
diff --git a/contrib/scripts/gnunet-logread/Makefile.am b/contrib/scripts/gnunet-logread/Makefile.am
index d0054391c..d53a8b8cf 100644
--- a/contrib/scripts/gnunet-logread/Makefile.am
+++ b/contrib/scripts/gnunet-logread/Makefile.am
@@ -4,11 +4,11 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include -I$(top_builddir)/src/include
 SUFFIXES = .in
 gnunet-logread: gnunet-logread.in Makefile
-        $(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-logread.in > gnunet-logread
+        $(AWK) -v prl="$(PERL)" -v pfx="$(prefix)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/gnunet-logread.in > gnunet-logread
        chmod +x gnunet-logread
 gnunet-logread-ipc-sdedit: gnunet-logread-ipc-sdedit.in Makefile
-        $(AWK) -v prl="$(PERL)" -f $(top_srcdir)/bin/dosubst.awk < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit
+        $(AWK) -v prl="$(PERL)" -f $(top_srcdir)/scripts/dosubst.awk < $(srcdir)/gnunet-logread-ipc-sdedit.in > gnunet-logread-ipc-sdedit
        chmod +x gnunet-logread-ipc-sdedit
 CLEANFILES=     \
diff --git a/contrib/scripts/meson.build b/contrib/scripts/meson.build
new file mode 100644
index 000000000..d56ba2b76
--- /dev/null
+++ b/contrib/scripts/meson.build
@@ -0,0 +1,4 @@
+install_data('gnunet-bugreport',
+             install_dir: get_option('bindir'))
+install_data('gnunet-suidfix',
+             install_dir: get_option('libdir')/'gnunet'/'libexec')
diff --git a/contrib/scripts/netjail/netjail_core.sh b/contrib/scripts/netjail/netjail_core.sh
deleted file mode 100755
index d53315052..000000000
--- a/contrib/scripts/netjail/netjail_core.sh
+++ /dev/null
@@ -1,217 +0,0 @@
-#!/bin/sh
-# 
-JAILOR=${SUDO_USER:?must run in sudo}
-PREFIX=${PPID:?must run from a parent process}
-# running with `sudo` is required to be
-# able running the actual commands as the
-# original user.
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-export RESULT=
-export NAMESPACE_NUM=0
-export INTERFACE_NUM=0
-netjail_next_namespace() {
-        local NUM=$NAMESPACE_NUM
-        NAMESPACE_NUM=$(($NAMESPACE_NUM + 1))
-        RESULT=$NUM
-}
-netjail_next_interface() {
-        local NUM=$INTERFACE_NUM
-        INTERFACE_NUM=$(($INTERFACE_NUM + 1))
-        RESULT=$NUM
-}
-netjail_opt() {
-        local OPT=$1
-        shift 1
-        INDEX=1
-        while [ $# -gt 0 ]; do
-                if [ "$1" = "$OPT" ]; then
-                        RESULT=$INDEX
-                        return
-                fi
-                INDEX=$(($INDEX + 1))
-                shift 1
-        done
-        RESULT=0
-}
-netjail_opts() {
-        local OPT=$1
-        local DEF=$2
-        shift 2
-        
-        while [ $# -gt 0 ]; do
-                if [ "$1" = "$OPT" ]; then
-                        printf "$2"
-                        return
-                fi
-                shift 1
-        done
-        
-        RESULT="$DEF"
-}
-netjail_check() {
-        local NODE_COUNT=$1
-        local FD_COUNT=$(($(ls /proc/self/fd | wc -w) - 4))
-        # quit if `$FD_COUNT < ($LOCAL_M * $GLOBAL_N * 2)`:
-        # the script also requires `sudo -C ($FD_COUNT + 4)`
-        # so you need 'Defaults closefrom_override' in the
-        # sudoers file.
-        if [ $FD_COUNT -lt $(($NODE_COUNT * 2)) ]; then
-                echo "File descriptors do not match requirements!" >&2
-                exit 1
-        fi
-}
-netjail_check_bin() {
-        local PROGRAM=$1
-        local MATCH=$(ls $(echo $PATH | tr ":" "\n") | grep "^$PROGRAM\$" | tr "\n" " " | awk '{ print $1 }')
-        # quit if the required binary $PROGRAM can not be
-        # found in the used $PATH.
-        if [ "$MATCH" != "$PROGRAM" ]; then
-                echo "Required binary not found: $PROGRAM" >&2
-                exit 1
-        fi
-}
-netjail_bridge() {
-        netjail_next_interface
-        local NUM=$RESULT
-        local BRIDGE=$(printf "%06x-%08x" $PREFIX $NUM)
-        ip link add $BRIDGE type bridge
-        ip link set dev $BRIDGE up
-        
-        RESULT=$BRIDGE
-}
-netjail_bridge_clear() {
-        local BRIDGE=$1
-        ip link delete $BRIDGE
-}
-netjail_node() {
-        netjail_next_namespace
-        local NUM=$RESULT
-        local NODE=$(printf "%06x-%08x" $PREFIX $NUM)
-        ip netns add $NODE
-        
-        RESULT=$NODE
-}
-netjail_node_clear() {
-        local NODE=$1
-        ip netns delete $NODE
-}
-netjail_node_link_bridge() {
-        local NODE=$1
-        local BRIDGE=$2
-        local ADDRESS=$3
-        local MASK=$4
-        
-        netjail_next_interface
-        local NUM_IF=$RESULT
-        netjail_next_interface
-        local NUM_BR=$RESULT
-        
-        local LINK_IF=$(printf "%06x-%08x" $PREFIX $NUM_IF)
-        local LINK_BR=$(printf "%06x-%08x" $PREFIX $NUM_BR)
-        ip link add $LINK_IF type veth peer name $LINK_BR
-        ip link set $LINK_IF netns $NODE
-        ip link set $LINK_BR master $BRIDGE
-        ip -n $NODE addr add "$ADDRESS/$MASK" dev $LINK_IF
-        ip -n $NODE link set $LINK_IF up
-        ip -n $NODE link set up dev lo
-        ip link set $LINK_BR up
-        
-        RESULT=$LINK_BR
-}
-netjail_node_unlink_bridge() {
-        local LINK_BR=$1
-        ip link delete $LINK_BR
-}
-netjail_node_add_nat() {
-        local NODE=$1
-        local ADDRESS=$2
-        local MASK=$3
-        ip netns exec $NODE iptables -t nat -A POSTROUTING -s "$ADDRESS/$MASK" -j MASQUERADE
-}
-netjail_node_add_default() {
-        local NODE=$1
-        local ADDRESS=$2
-        ip -n $NODE route add default via $ADDRESS
-}
-netjail_node_exec() {
-        local NODE=$1
-        local FD_IN=$2
-        local FD_OUT=$3
-        shift 3
-        ip netns exec $NODE sudo -u $JAILOR -- $@ 1>& $FD_OUT 0<& $FD_IN
-}
-netjail_kill() {
-        local PID=$1
-        local MATCH=$(ps --pid $PID | awk "{ if ( \$1 == $PID ) { print \$1 } }" | wc -l)
-        if [ $MATCH -gt 0 ]; then
-                kill -n 19 $PID
-                for CHILD in $(ps -o pid,ppid -ax | awk "{ if ( \$2 == $PID ) { print \$1 } }"); do
-                        netjail_kill $CHILD
-                done
-                kill $PID
-        fi
-}
-netjail_killall() {
-        if [ $# -gt 0 ]; then
-                local PIDS=$1
-                for PID in $PIDS; do
-                        netjail_kill $PID
-                done
-        fi
-}
-netjail_waitall() {
-        if [ $# -gt 0 ]; then
-                local PIDS=$1
-                for PID in $PIDS; do
-                        wait $PID
-                done
-        fi
-}
diff --git a/contrib/scripts/netjail/netjail_setup_internet.sh b/contrib/scripts/netjail/netjail_setup_internet.sh
deleted file mode 100755
index ea820f38c..000000000
--- a/contrib/scripts/netjail/netjail_setup_internet.sh
+++ /dev/null
@@ -1,166 +0,0 @@
-#!/bin/bash
-. "./netjail_core.sh"
-set -eu
-set -x
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-PREFIX=$PPID
-LOCAL_M=$1
-GLOBAL_N=$2
-shift 2
-netjail_check $(($LOCAL_M * $GLOBAL_N))
-# Starts optionally an amount of nodes without NAT starting with "92.68.151.1"
-netjail_opt '--known' $@
-KNOWN=$RESULT
-netjail_opts '--known' 0 $@
-KNOWN_NUM=$RESULT
-# Starts optionally 'stunserver' on "92.68.150.254":
-netjail_opt '--stun' $@
-STUN=$RESULT
-if [ $KNOWN -gt 0 ]; then
-        shift 2
-        KNOWN=$KNOWN_NUM
-        
-        netjail_check $(($LOCAL_M * $GLOBAL_N + $KNOWN))
-fi
-if [ $STUN -gt 0 ]; then
-        netjail_check_bin stunserver
-        
-        shift 1
-fi
-netjail_check_bin $1
-LOCAL_GROUP="192.168.15"
-GLOBAL_GROUP="92.68.150"
-KNOWN_GROUP="92.68.151"
-CLEANUP=0
-echo "Start [local: $LOCAL_GROUP.0/24, global: $GLOBAL_GROUP.0/16, stun: $STUN]"
-netjail_bridge
-NETWORK_NET=$RESULT
-for X in $(seq $KNOWN); do
-        netjail_node
-        KNOWN_NODES[$X]=$RESULT
-        netjail_node_link_bridge ${KNOWN_NODES[$X]} $NETWORK_NET "$KNOWN_GROUP.$X" 16
-        KNOWN_LINKS[$X]=$RESULT
-done
-declare -A NODES
-declare -A NODE_LINKS
-for N in $(seq $GLOBAL_N); do
-        netjail_node
-        ROUTERS[$N]=$RESULT
-        netjail_node_link_bridge ${ROUTERS[$N]} $NETWORK_NET "$GLOBAL_GROUP.$N" 16
-        NETWORK_LINKS[$N]=$RESULT
-        netjail_bridge
-        ROUTER_NETS[$N]=$RESULT
-        
-        for M in $(seq $LOCAL_M); do
-                netjail_node
-                NODES[$N,$M]=$RESULT
-                netjail_node_link_bridge ${NODES[$N,$M]} ${ROUTER_NETS[$N]} "$LOCAL_GROUP.$M" 24
-                NODE_LINKS[$N,$M]=$RESULT
-        done
-        ROUTER_ADDR="$LOCAL_GROUP.$(($LOCAL_M+1))"
-        netjail_node_link_bridge ${ROUTERS[$N]} ${ROUTER_NETS[$N]} $ROUTER_ADDR 24
-        ROUTER_LINKS[$N]=$RESULT
-        
-        netjail_node_add_nat ${ROUTERS[$N]} $ROUTER_ADDR 24
-        
-        for M in $(seq $LOCAL_M); do
-                netjail_node_add_default ${NODES[$N,$M]} $ROUTER_ADDR
-        done
-done
-WAITING=""
-KILLING=""
-if [ $STUN -gt 0 ]; then
-        netjail_node
-        STUN_NODE=$RESULT
-        netjail_node_link_bridge $STUN_NODE $NETWORK_NET "$GLOBAL_GROUP.254" 16
-        STUN_LINK=$RESULT
-        netjail_node_exec $STUN_NODE 0 1 stunserver &
-        KILLING="$!"
-fi
-for X in $(seq $KNOWN); do
-        INDEX=$(($X - 1))
-        FD_X=$(($INDEX * 2 + 3 + 0))
-        FD_Y=$(($INDEX * 2 + 3 + 1))
-        netjail_node_exec ${KNOWN_NODES[$X]} $FD_X $FD_Y $@ &
-        WAITING="$! $WAITING"
-done
-for N in $(seq $GLOBAL_N); do
-        for M in $(seq $LOCAL_M); do
-                INDEX=$(($LOCAL_M * ($N - 1) + $M - 1 + $KNOWN))
-                
-                FD_X=$(($INDEX * 2 + 3 + 0))
-                FD_Y=$(($INDEX * 2 + 3 + 1))
-                netjail_node_exec ${NODES[$N,$M]} $FD_X $FD_Y $@ &
-                WAITING="$! $WAITING"
-        done
-done
-cleanup() {
-        if [ $STUN -gt 0 ]; then
-                netjail_node_unlink_bridge $STUN_LINK
-                netjail_node_clear $STUN_NODE
-        fi
-        for X in $(seq $KNOWN); do
-                netjail_node_unlink_bridge ${KNOWN_LINKS[$X]}
-                netjail_node_clear ${KNOWN_NODES[$X]}
-        done
-        for N in $(seq $GLOBAL_N); do
-                for M in $(seq $LOCAL_M); do
-                        netjail_node_unlink_bridge ${NODE_LINKS[$N,$M]}
-                        netjail_node_clear ${NODES[$N,$M]}
-                done
-                netjail_node_unlink_bridge ${ROUTER_LINKS[$N]}
-                netjail_bridge_clear ${ROUTER_NETS[$N]}
-                netjail_node_unlink_bridge ${NETWORK_LINKS[$N]}
-                netjail_node_clear ${ROUTERS[$N]}
-        done
-        netjail_bridge_clear $NETWORK_NET
-}
-trapped_cleanup() {
-        netjail_killall $WAITING
-        netjail_killall $KILLING
-        cleanup
-}
-trap 'trapped_cleanup' ERR
-netjail_waitall $WAITING
-netjail_killall $KILLING
-wait
-cleanup
-echo "Done"
diff --git a/contrib/scripts/news_delta.sh b/contrib/scripts/news_delta.sh
new file mode 100755
index 000000000..20fb98649
--- /dev/null
+++ b/contrib/scripts/news_delta.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+OLDVERSION=$1
+git --no-pager log --grep="^NEWS: " -i --no-merges --no-color --format="%s%n%b" $1..HEAD | grep -i "^NEWS:\s[a-zA-Z][a-zA-Z]*" | sed 's/NEWS:/  -/i'
+echo ""
diff --git a/contrib/scripts/update_news.sh b/contrib/scripts/update_news.sh
new file mode 100755
index 000000000..014ac8bd7
--- /dev/null
+++ b/contrib/scripts/update_news.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+NEW_VERSION=$1
+if [ -z $NEW_VERSION ]; then
+    NEW_VERSION="Unreleased"
+fi
+DELTA_SH="contrib/scripts/news_delta.sh"
+LASTVER=$(head -n1 NEWS | tr -d :)
+echo "$NEW_VERSION:" > NEWS.delta || exit 1
+$DELTA_SH $LASTVER >> NEWS.delta || exit 1
+cp NEWS NEWS.bak || exit 1
+cat NEWS.delta > NEWS || exit 1
+cat NEWS.bak >> NEWS || exit 1
+rm NEWS.bak NEWS.delta
diff --git a/contrib/testing_hostkeys.ecc b/contrib/testing_hostkeys.ecc
deleted file mode 100644
index 29bd6ece2..000000000
--- a/contrib/testing_hostkeys.ecc
+++ /dev/null
Binary files differ