diff --git a/.github/workflows/deploy_pietervdvn.yml b/.github/workflows/deploy_pietervdvn.yml
index 00d2dedbc8..36d4ebc269 100644
--- a/.github/workflows/deploy_pietervdvn.yml
+++ b/.github/workflows/deploy_pietervdvn.yml
@@ -3,7 +3,8 @@ on:
   push:
     branches:
       - develop
-      - feature/vite
+      - feature/*
+      - theme/*
 jobs:
   build:
     runs-on: ubuntu-latest
diff --git a/assets/themes/advertising/Advertising_icon.svg b/assets/themes/advertising/Advertising_icon.svg
deleted file mode 100644
index 6798138e3a..0000000000
--- a/assets/themes/advertising/Advertising_icon.svg
+++ /dev/null
@@ -1,83 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="32"
-   height="32"
-   id="svg5457"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   viewBox="0 0 32 32"
-   sodipodi:docname="advertising.svg">
-  <defs
-     id="defs5459" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.836083"
-     inkscape:cx="-1.9854128"
-     inkscape:cy="15.625013"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1600"
-     inkscape:window-height="843"
-     inkscape:window-x="1440"
-     inkscape:window-y="464"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata5462">
-    <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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#202020;stroke-width:4.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
-       d="m 16,32 0,-5"
-       id="path6026"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m 10,31.5 12,0"
-       id="path6005"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cc" />
-    <rect
-       style="opacity:1;fill:#feffba;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.848;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect6028"
-       width="20.152472"
-       height="25.152472"
-       x="5.9237647"
-       y="0.92376363" />
-    <path
-       transform="matrix(0.9803389,0,0,1.0135171,8.6732738,7.8426536)"
-       style="opacity:1;fill:#ff0016;fill-opacity:1;fill-rule:nonzero;stroke:#ff3737;stroke-width:0.35878387;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       inkscape:transform-center-x="-0.32694747"
-       inkscape:transform-center-y="-0.85530604"
-       d="M 11.852914,10.89769 8.7470388,8.8849391 6.7989073,12.401607 5.1628254,9.0627254 1.5888841,9.8053465 3.6943193,6.7673231 -0.07627651,4.218202 4.0896155,3.7838182 2.458546,-0.73052826 6.162167,1.3863455 8.0452685,-1.7264197 9.1498521,2.3900054 12.660019,1.2322226 10.68217,4.179278 15.039542,6.4644525 10.286855,7.0317576 Z"
-       id="path6030" />
-  </g>
-</svg>
diff --git a/assets/themes/advertising/Billboard.svg b/assets/themes/advertising/Billboard.svg
index d5007ee21d..b98e6e834c 100644
--- a/assets/themes/advertising/Billboard.svg
+++ b/assets/themes/advertising/Billboard.svg
@@ -2,28 +2,28 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
+   width="209.25972mm"
+   height="256.42511mm"
+   viewBox="0 0 741.47145 908.59291"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.0 15301"
-   sodipodi:docname="Billboard_trunk.svg">
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="Billboard.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="1294.0308 : 862.92261 : 1"
-       inkscape:vp_y="-660.45823 : 631.34623 : 0"
-       inkscape:vp_z="769.65175 : 1058.4834 : 1"
-       inkscape:persp3d-origin="1595.5628 : 1252.3864 : 1"
+       inkscape:vp_x="1291.7664 : 864.17924 : 1"
+       inkscape:vp_y="-660.45823 : 631.34621 : 0"
+       inkscape:vp_z="767.38733 : 1059.74 : 1"
+       inkscape:persp3d-origin="1593.2984 : 1253.643 : 1"
        id="perspective7227" />
   </defs>
   <sodipodi:namedview
@@ -33,20 +33,23 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.35"
-     inkscape:cx="-1255.1601"
-     inkscape:cy="585.55979"
+     inkscape:zoom="0.7991692"
+     inkscape:cx="232.7417"
+     inkscape:cy="509.90453"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1553"
-     inkscape:window-height="876"
-     inkscape:window-x="47"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
+     inkscape:window-width="1920"
+     inkscape:window-height="995"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="0">
     <inkscape:grid
        type="xygrid"
-       id="grid4298" />
+       id="grid4298"
+       originx="-1.4071445"
+       originy="-146.62649" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -56,16 +59,16 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-1.4071445,-146.6265)">
     <rect
-       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:22.35635376;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:22.3564;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4219"
        width="719.11511"
        height="563.40045"
@@ -100,7 +103,7 @@
        transform="matrix(1.4731919,0,0,1.303209,-401.95758,-64.293593)" />
     <path
        sodipodi:type="star"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;stroke:#ff0000;stroke-width:8.00043869;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#b5befe;fill-opacity:1;stroke:#ff0000;stroke-width:8.00044;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4180"
        sodipodi:sides="5"
        sodipodi:cx="355.44702"
@@ -119,52 +122,52 @@
     <g
        sodipodi:type="inkscape:box3d"
        id="g7229"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.6590004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.659;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        inkscape:perspectiveID="#perspective7227"
        inkscape:corner0="-1.7750984 : -0.31587834 : 0 : 1"
        inkscape:corner7="-1.8455619 : -0.40889015 : 0.12606765 : 1">
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7235"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99110889;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99111;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="3"
-         d="m 635.84798,434.61518 54.84857,-20.4313 -72.6504,-69.44809 -61.45316,14.11784 z"
-         points="690.69655,414.18388 618.04615,344.73579 556.59299,358.85363 635.84798,434.61518 " />
+         d="m 634.99073,436.2157 54.84858,-20.43129 -72.65041,-69.44809 -61.45316,14.11784 z"
+         points="689.83931,415.78441 617.1889,346.33632 555.73574,360.45416 634.99073,436.2157 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7231"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99110889;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99111;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="6"
-         d="m 635.84798,434.61518 -79.25499,-75.76155 -41.38451,70.89266 94.64947,90.47746 z"
-         points="556.59299,358.85363 515.20848,429.74629 609.85795,520.22375 635.84798,434.61518 " />
+         d="m 634.99073,436.2157 -79.25499,-75.76154 -41.3845,70.89265 94.64947,90.47746 z"
+         points="555.73574,360.45416 514.35124,431.34681 609.00071,521.82427 634.99073,436.2157 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7233"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99110889;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99111;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="5"
-         d="m 635.84798,434.61518 54.84857,-20.4313 -13.83429,73.6446 -67.00431,32.39527 z"
-         points="690.69655,414.18388 676.86226,487.82848 609.85795,520.22375 635.84798,434.61518 " />
+         d="m 634.99073,436.2157 54.84858,-20.43129 -13.8343,73.64459 -67.0043,32.39527 z"
+         points="689.83931,415.78441 676.00501,489.429 609.00071,521.82427 634.99073,436.2157 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7241"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99110889;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99111;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="11"
-         d="m 609.85795,520.22375 67.00431,-32.39527 -85.38,-81.61657 -76.27378,23.53438 z"
-         points="676.86226,487.82848 591.48226,406.21191 515.20848,429.74629 609.85795,520.22375 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7239"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99110889;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="13"
-         d="m 556.59299,358.85363 61.45316,-14.11784 -26.56389,61.47612 -76.27378,23.53438 z"
-         points="618.04615,344.73579 591.48226,406.21191 515.20848,429.74629 556.59299,358.85363 " />
+         d="m 609.00071,521.82427 67.0043,-32.39527 -85.37999,-81.61657 -76.27378,23.53438 z"
+         points="676.00501,489.429 590.62502,407.81243 514.35124,431.34681 609.00071,521.82427 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7237"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99110889;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99111;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="14"
-         d="m 690.69655,414.18388 -72.6504,-69.44809 -26.56389,61.47612 85.38,81.61657 z"
-         points="618.04615,344.73579 591.48226,406.21191 676.86226,487.82848 690.69655,414.18388 " />
+         d="M 689.83931,415.78441 617.1889,346.33632 590.62502,407.81243 676.00501,489.429 Z"
+         points="617.1889,346.33632 590.62502,407.81243 676.00501,489.429 689.83931,415.78441 " />
+      <path
+         sodipodi:type="inkscape:box3dside"
+         id="path7239"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:9.99111;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:box3dsidetype="13"
+         d="m 555.73574,360.45416 61.45316,-14.11784 -26.56388,61.47611 -76.27378,23.53438 z"
+         points="617.1889,346.33632 590.62502,407.81243 514.35124,431.34681 555.73574,360.45416 " />
     </g>
   </g>
 </svg>
diff --git a/assets/themes/advertising/Board.svg b/assets/themes/advertising/Board.svg
index 1ac9fbde57..917190ea8e 100644
--- a/assets/themes/advertising/Board.svg
+++ b/assets/themes/advertising/Board.svg
@@ -2,28 +2,28 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
+   width="163.80348mm"
+   height="167.33861mm"
+   viewBox="0 0 580.40604 592.93207"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.0 15301"
-   sodipodi:docname="Board.svg">
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="Board.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="1063.7116 : 820.59039 : 1"
-       inkscape:vp_y="-491.90589 : 452.23512 : 0"
-       inkscape:vp_z="673.15686 : 960.67113 : 1"
-       inkscape:persp3d-origin="1288.2911 : 1099.5644 : 1"
+       inkscape:vp_x="972.69781 : 585.48216 : 1"
+       inkscape:vp_y="-491.90589 : 452.23511 : 0"
+       inkscape:vp_z="582.14307 : 725.56289 : 1"
+       inkscape:persp3d-origin="1197.2773 : 864.45616 : 1"
        id="perspective7227" />
   </defs>
   <sodipodi:namedview
@@ -33,20 +33,23 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4"
-     inkscape:cx="189.12658"
-     inkscape:cy="568.76113"
+     inkscape:zoom="1.0196925"
+     inkscape:cx="573.70235"
+     inkscape:cy="436.8964"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1553"
-     inkscape:window-height="876"
-     inkscape:window-x="47"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
+     inkscape:window-width="1920"
+     inkscape:window-height="995"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="0">
     <inkscape:grid
        type="xygrid"
-       id="grid4298" />
+       id="grid4298"
+       originx="-80.013376"
+       originy="-229.43016" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -56,16 +59,16 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-80.013378,-229.43016)">
     <rect
-       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:101.48020172;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:101.48;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect7422-8-4"
        width="478.92584"
        height="229.2673"
@@ -79,14 +82,14 @@
        x="86.892349"
        y="239.54822" />
     <rect
-       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:14.13468552;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:14.1347;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect7422-8"
        width="8.5147648"
        height="250.17702"
        x="211.88652"
        y="565.11786" />
     <rect
-       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:14.13468456;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:14.1347;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect7422-8-0"
        width="8.5147657"
        height="250.177"
@@ -107,7 +110,7 @@
        transform="matrix(1.062387,0,0,0.93980447,-198.19828,47.237072)" />
     <path
        sodipodi:type="star"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;stroke:#ff0000;stroke-width:8.00043869;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#b5befe;fill-opacity:1;stroke:#ff0000;stroke-width:8.00044;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4180"
        sodipodi:sides="5"
        sodipodi:cx="355.44702"
@@ -126,52 +129,52 @@
     <g
        sodipodi:type="inkscape:box3d"
        id="g7229"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.6590004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.659;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        inkscape:perspectiveID="#perspective7227"
        inkscape:corner0="-1.7750984 : -0.31587834 : 0 : 1"
        inkscape:corner7="-1.8455619 : -0.40889015 : 0.12606765 : 1">
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7235"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="3"
-         d="m 573.5004,407.39176 40.85093,-14.63499 -54.10964,-49.74586 -45.77,10.11264 z"
-         points="614.35133,392.75677 560.24169,343.01091 514.47169,353.12355 573.5004,407.39176 " />
+         d="m 562.50001,412.5 40.85094,-14.635 -54.10965,-49.74586 -45.77,10.11264 z"
+         points="603.35095,397.865 549.2413,348.11914 503.4713,358.23178 562.50001,412.5 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7231"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="6"
-         d="m 573.5004,407.39176 -59.02871,-54.26821 -30.82299,50.78061 70.49444,64.80926 z"
-         points="514.47169,353.12355 483.6487,403.90416 554.14314,468.71342 573.5004,407.39176 " />
+         d="m 562.50001,412.5 -59.02871,-54.26822 -30.82299,50.78061 70.49444,64.80926 z"
+         points="503.4713,358.23178 472.64831,409.01239 543.14275,473.82165 562.50001,412.5 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7233"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="5"
-         d="m 573.5004,407.39176 40.85093,-14.63499 -10.30372,52.75183 -49.90447,23.20482 z"
-         points="614.35133,392.75677 604.04761,445.5086 554.14314,468.71342 573.5004,407.39176 " />
+         d="m 562.50001,412.5 40.85094,-14.635 -10.30373,52.75183 -49.90447,23.20482 z"
+         points="603.35095,397.865 593.04722,450.61683 543.14275,473.82165 562.50001,412.5 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7241"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="11"
-         d="M 554.14314,468.71342 604.04761,445.5086 540.45703,387.04642 483.6487,403.90416 Z"
-         points="604.04761,445.5086 540.45703,387.04642 483.6487,403.90416 554.14314,468.71342 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7239"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="13"
-         d="m 514.47169,353.12355 45.77,-10.11264 -19.78466,44.03551 -56.80833,16.85774 z"
-         points="560.24169,343.01091 540.45703,387.04642 483.6487,403.90416 514.47169,353.12355 " />
+         d="m 543.14275,473.82165 49.90447,-23.20482 -63.59058,-58.46218 -56.80833,16.85774 z"
+         points="593.04722,450.61683 529.45664,392.15465 472.64831,409.01239 543.14275,473.82165 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7237"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="14"
-         d="m 614.35133,392.75677 -54.10964,-49.74586 -19.78466,44.03551 63.59058,58.46218 z"
-         points="560.24169,343.01091 540.45703,387.04642 604.04761,445.5086 614.35133,392.75677 " />
+         d="m 603.35095,397.865 -54.10965,-49.74586 -19.78466,44.03551 63.59058,58.46218 z"
+         points="549.2413,348.11914 529.45664,392.15465 593.04722,450.61683 603.35095,397.865 " />
+      <path
+         sodipodi:type="inkscape:box3dside"
+         id="path7239"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:box3dsidetype="13"
+         d="m 503.4713,358.23178 45.77,-10.11264 -19.78466,44.03551 -56.80833,16.85774 z"
+         points="549.2413,348.11914 529.45664,392.15465 472.64831,409.01239 503.4713,358.23178 " />
     </g>
   </g>
 </svg>
diff --git a/assets/themes/advertising/Board_free.svg b/assets/themes/advertising/Board_free.svg
deleted file mode 100644
index 57ff9cadef..0000000000
--- a/assets/themes/advertising/Board_free.svg
+++ /dev/null
@@ -1,130 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Board_free3_3.svg">
-  <defs
-     id="defs4" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.9899495"
-     inkscape:cx="240.85158"
-     inkscape:cy="491.73153"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1535"
-     inkscape:window-height="876"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4298" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#7c7c7c;fill-opacity:1;stroke:#2c6823;stroke-width:101.48020172;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8-4"
-       width="478.92584"
-       height="229.2673"
-       x="130.75348"
-       y="280.17026" />
-    <rect
-       style="fill:#fffe73;fill-opacity:1;stroke:#ff0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4221-7-5"
-       width="566.664"
-       height="314.814"
-       x="86.892349"
-       y="239.54822" />
-    <rect
-       style="fill:#7c7c7c;fill-opacity:1;stroke:#2c6823;stroke-width:14.13468552;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8"
-       width="8.5147648"
-       height="250.17702"
-       x="211.88652"
-       y="564.73523" />
-    <rect
-       style="fill:#2c6823;fill-opacity:1;stroke:#2c6823;stroke-width:14.13468456;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8-0"
-       width="8.5147657"
-       height="250.177"
-       x="531.74725"
-       y="564.37946" />
-    <rect
-       style="fill:#7c7c7c;fill-opacity:1;stroke:#2c6823;stroke-width:38.41460037;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8-4-2"
-       width="571.94531"
-       height="27.509706"
-       x="85.360123"
-       y="192.63847" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:60.81061172px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="51.372849"
-       y="308.92157"
-       id="text5160"
-       sodipodi:linespacing="125%"
-       transform="scale(1.3817739,0.72370741)"
-       inkscape:transform-center-x="25.619003"
-       inkscape:transform-center-y="24.017157"><tspan
-         sodipodi:role="line"
-         id="tspan5162"
-         x="51.372849"
-         y="308.92157">Affichage libre</tspan></text>
-    <rect
-       style="fill:#cc8a8a;fill-opacity:1;stroke:#7e7e7e;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7352"
-       width="181.15384"
-       height="206.07597"
-       x="111.26551"
-       y="265.96823" />
-    <rect
-       style="fill:#909098;fill-opacity:1;stroke:#7e7e7e;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7352-5-4"
-       width="250.69118"
-       height="229.86662"
-       x="374.40759"
-       y="277.86353" />
-    <rect
-       style="fill:#c0afaf;fill-opacity:1;stroke:#7e7e7e;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7352-5"
-       width="347.67044"
-       height="83.072723"
-       x="209.70787"
-       y="353.32309" />
-  </g>
-</svg>
diff --git a/assets/themes/advertising/Column_3.svg b/assets/themes/advertising/Column.svg
similarity index 60%
rename from assets/themes/advertising/Column_3.svg
rename to assets/themes/advertising/Column.svg
index 0e953dd804..f1ff90bf2c 100644
--- a/assets/themes/advertising/Column_3.svg
+++ b/assets/themes/advertising/Column.svg
@@ -2,61 +2,36 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
+   width="94.520744mm"
+   height="265.41531mm"
+   viewBox="0 0 334.91602 940.44796"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.1 15371"
-   sodipodi:docname="Column_3.svg">
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="Column.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5961">
-      <stop
-         style="stop-color:#ab9e9e;stop-opacity:1;"
-         offset="0"
-         id="stop5963" />
-      <stop
-         style="stop-color:#ab9e9e;stop-opacity:0;"
-         offset="1"
-         id="stop5965" />
-    </linearGradient>
     <linearGradient
        id="linearGradient7260"
-       osb:paint="solid">
+       inkscape:swatch="solid">
       <stop
          style="stop-color:#999999;stop-opacity:1;"
          offset="0"
          id="stop7262" />
     </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5961"
-       id="radialGradient5967"
-       cx="48.586868"
-       cy="895.33686"
-       fx="48.586868"
-       fy="895.33686"
-       r="311.93798"
-       gradientTransform="matrix(0.59380876,0,0,0.39494729,146.22327,516.43553)"
-       gradientUnits="userSpaceOnUse" />
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="878.7115 : 467.59038 : 1"
-       inkscape:vp_y="-491.90589 : 452.23512 : 0"
-       inkscape:vp_z="488.15674 : 607.67112 : 1"
-       inkscape:persp3d-origin="1103.2909 : 746.56442 : 1"
+       inkscape:vp_x="663.33917 : 387.3454 : 1"
+       inkscape:vp_y="-491.90592 : 452.23512 : 0"
+       inkscape:vp_z="272.78439 : 527.42614 : 1"
+       inkscape:persp3d-origin="887.91862 : 666.31944 : 1"
        id="perspective7227" />
   </defs>
   <sodipodi:namedview
@@ -66,21 +41,24 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="2.8"
-     inkscape:cx="433.99381"
-     inkscape:cy="176.62132"
+     inkscape:zoom="0.57388031"
+     inkscape:cx="-121.97665"
+     inkscape:cy="514.91573"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1553"
-     inkscape:window-height="876"
-     inkscape:window-x="47"
-     inkscape:window-y="24"
+     inkscape:window-width="1920"
+     inkscape:window-height="995"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     inkscape:snap-bbox="true">
+     inkscape:snap-bbox="true"
+     inkscape:pagecheckerboard="0">
     <inkscape:grid
        type="xygrid"
-       id="grid4298" />
+       id="grid4298"
+       originx="-207.49699"
+       originy="-47.527465" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -90,28 +68,23 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
-    <path
-       style="fill:url(#radialGradient5967);fill-opacity:1;fill-rule:evenodd;stroke:#fafafa;stroke-width:1.18075502px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="m -9.5256381,883.56876 369.4268181,108.68856 0,-244.54923 -287.331968,0 -41.047425,27.17215 -20.523713,27.17213 z"
-       id="path4491"
-       inkscape:connector-curvature="0" />
+     id="layer1"
+     transform="translate(-207.49698,-47.527464)">
     <rect
-       style="fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.47271633;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.47272;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect7276-0"
        width="268.05264"
        height="28.990143"
        x="240.23636"
        y="241.1357" />
     <rect
-       style="fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.47271633;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.47272;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect7276-0-94"
        width="268.05264"
        height="28.990143"
@@ -120,14 +93,14 @@
        inkscape:transform-center-x="22.223356"
        inkscape:transform-center-y="-92.934034" />
     <ellipse
-       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:5.01361847;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:5.01362;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4353"
        cx="374.55356"
        cy="943.07642"
        rx="142.66008"
        ry="42.392216" />
     <rect
-       style="fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.95901918;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.95902;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect7276"
        width="285"
        height="100.68885"
@@ -141,42 +114,42 @@
        x="234.37495"
        y="939.32648" />
     <ellipse
-       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:5.01361847;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:5.01362;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4353-3"
        cx="374.50281"
        cy="839.58398"
        rx="142.66008"
        ry="42.392216" />
     <ellipse
-       style="opacity:1;fill:#fffe73;fill-opacity:1;stroke:#fffe73;stroke-width:2.00623798;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#fffe73;fill-opacity:1;stroke:#fffe73;stroke-width:2.00624;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4353-3-9"
        cx="374.58447"
        cy="844.92804"
        rx="132.45499"
        ry="27.30596" />
     <rect
-       style="fill:#fffe73;fill-opacity:1;stroke:#3c24ff;stroke-width:2.01397204;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#fffe73;fill-opacity:1;stroke:#3c24ff;stroke-width:2.01397;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4221-7-5"
        width="264.98602"
        height="581.25702"
        x="242.13326"
        y="268.04715" />
     <ellipse
-       style="opacity:1;fill:#a297ff;fill-opacity:1;stroke:#3c24ff;stroke-width:2.10165715;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#a297ff;fill-opacity:1;stroke:#3c24ff;stroke-width:2.10166;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4353-3-9-0"
        cx="374.44641"
        cy="280.89734"
        rx="132.96378"
        ry="29.850483" />
     <ellipse
-       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.88478994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.88479;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4353-8"
        cx="374.95499"
        cy="265.93356"
        rx="165.01561"
        ry="42.203125" />
     <rect
-       style="fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.8621912;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.86219;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect7276-0-9"
        width="330.0538"
        height="49.640549"
@@ -197,21 +170,21 @@
        x="212.38081"
        y="261.00903" />
     <ellipse
-       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.88478994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.88479;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4353-8-5"
        cx="374.95499"
        cy="215.21928"
        rx="165.01561"
        ry="42.203125" />
     <ellipse
-       style="fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:3.60110641;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:3.60111;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="path4266"
        cx="381.66556"
        cy="153.92078"
        rx="83.145805"
        ry="60.425892" />
     <ellipse
-       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.8354497;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:4.83545;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path4187"
        cx="383.12576"
        cy="79.631348"
@@ -220,7 +193,7 @@
        inkscape:transform-center-x="11.392647"
        inkscape:transform-center-y="-54.46942" />
     <rect
-       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:2.00724363;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#184a00;stroke-width:2.00724;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect4355-0"
        width="567.05408"
        height="5.5284724"
@@ -261,52 +234,52 @@
     <g
        sodipodi:type="inkscape:box3d"
        id="g7229"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.6590004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.659;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        inkscape:perspectiveID="#perspective7227"
        inkscape:corner0="-1.7750984 : -0.31587834 : 0 : 1"
        inkscape:corner7="-1.8455619 : -0.40889015 : 0.12606765 : 1">
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7235"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="3"
-         d="m 388.50043,760.39181 40.85092,-14.635 -54.10964,-49.74587 -45.76999,10.11265 z"
-         points="429.35135,745.75681 375.24171,696.01094 329.47172,706.12359 388.50043,760.39181 " />
+         d="m 380.625,776.25002 40.85094,-14.635 -54.10966,-49.74586 -45.76999,10.11265 z"
+         points="421.47594,761.61502 367.36628,711.86916 321.59629,721.98181 380.625,776.25002 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7231"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="6"
-         d="m 388.50043,760.39181 -59.02871,-54.26822 -30.82296,50.78061 70.49444,64.80927 z"
-         points="329.47172,706.12359 298.64876,756.9042 369.1432,821.71347 388.50043,760.39181 " />
+         d="m 380.625,776.25002 -59.02871,-54.26821 -30.82297,50.78061 70.49444,64.80927 z"
+         points="321.59629,721.98181 290.77332,772.76242 361.26776,837.57169 380.625,776.25002 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7233"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="5"
-         d="m 388.50043,760.39181 40.85092,-14.635 -10.3037,52.75184 -49.90445,23.20482 z"
-         points="429.35135,745.75681 419.04765,798.50865 369.1432,821.71347 388.50043,760.39181 " />
+         d="m 380.625,776.25002 40.85094,-14.635 -10.30372,52.75185 -49.90446,23.20482 z"
+         points="421.47594,761.61502 411.17222,814.36687 361.26776,837.57169 380.625,776.25002 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7241"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="11"
-         d="m 369.1432,821.71347 49.90445,-23.20482 -63.59058,-58.46219 -56.80831,16.85774 z"
-         points="419.04765,798.50865 355.45707,740.04646 298.64876,756.9042 369.1432,821.71347 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7239"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="13"
-         d="m 329.47172,706.12359 45.76999,-10.11265 -19.78464,44.03552 -56.80831,16.85774 z"
-         points="375.24171,696.01094 355.45707,740.04646 298.64876,756.9042 329.47172,706.12359 " />
+         d="m 361.26776,837.57169 49.90446,-23.20482 -63.59058,-58.46219 -56.80832,16.85774 z"
+         points="411.17222,814.36687 347.58164,755.90468 290.77332,772.76242 361.26776,837.57169 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7237"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="14"
-         d="m 429.35135,745.75681 -54.10964,-49.74587 -19.78464,44.03552 63.59058,58.46219 z"
-         points="375.24171,696.01094 355.45707,740.04646 419.04765,798.50865 429.35135,745.75681 " />
+         d="m 421.47594,761.61502 -54.10966,-49.74586 -19.78464,44.03552 63.59058,58.46219 z"
+         points="367.36628,711.86916 347.58164,755.90468 411.17222,814.36687 421.47594,761.61502 " />
+      <path
+         sodipodi:type="inkscape:box3dside"
+         id="path7239"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:box3dsidetype="13"
+         d="m 321.59629,721.98181 45.76999,-10.11265 -19.78464,44.03552 -56.80832,16.85774 z"
+         points="367.36628,711.86916 347.58164,755.90468 290.77332,772.76242 321.59629,721.98181 " />
     </g>
   </g>
 </svg>
diff --git a/assets/themes/advertising/Indication.svg b/assets/themes/advertising/Indication.svg
deleted file mode 100644
index f9d4b9b5c5..0000000000
--- a/assets/themes/advertising/Indication.svg
+++ /dev/null
@@ -1,227 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 15371"
-   sodipodi:docname="Indication.svg">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="992.53248 : 897.53393 : 1"
-       inkscape:vp_y="-438.42137 : 454.7557 : 0"
-       inkscape:vp_z="644.44241 : 1038.3954 : 1"
-       inkscape:persp3d-origin="1192.6937 : 1178.0628 : 1"
-       id="perspective7227" />
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
-      <path
-         id="path5776"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#ff0015;stroke-opacity:1;fill:#ff0015;fill-opacity:1"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) rotate(180) translate(0,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
-      <path
-         id="path5770"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#fffef3;stroke-opacity:1;fill:#fffef3;fill-opacity:1"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
-      <path
-         id="path5752"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#fffef3;stroke-width:1pt;stroke-opacity:1;fill:#fffef3;fill-opacity:1"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.5976901"
-     inkscape:cx="218.95283"
-     inkscape:cy="635.13235"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1553"
-     inkscape:window-height="876"
-     inkscape:window-x="47"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4298" />
-  </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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#7c7c7c;fill-opacity:1;stroke:#7e7e7e;stroke-width:15.00927258;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8"
-       width="8.4282274"
-       height="284.99072"
-       x="377.2074"
-       y="531.37036" />
-    <rect
-       style="fill:#fffe73;fill-opacity:1;stroke:#ff0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4221-7-5"
-       width="492.1875"
-       height="328.125"
-       x="121.875"
-       y="199.96101" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ff0015;stroke-width:5.70248604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
-       d="m 357.28356,449.56629 c 228.91165,0 228.91165,0 228.91165,0 v 0 0"
-       id="path5203"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.39366901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 697.68583,778.87649 Z"
-       id="path6523"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:75.0201416px;line-height:0%;font-family:'DejaVu Serif';-inkscape-font-specification:'DejaVu Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff0015;fill-opacity:1;stroke:none;stroke-width:6.25164795px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="167.83611"
-       y="440.87018"
-       id="text4305-9"
-       transform="scale(0.93242752,1.0724694)"><tspan
-         sodipodi:role="line"
-         id="tspan4581"
-         x="167.83611"
-         y="440.87018"
-         style="stroke-width:6.25164795px">3 km</tspan></text>
-    <path
-       sodipodi:type="spiral"
-       style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4178"
-       sodipodi:cx="354.86203"
-       sodipodi:cy="373.78302"
-       sodipodi:expansion="1"
-       sodipodi:revolution="2.2986083"
-       sodipodi:radius="74.712395"
-       sodipodi:argument="-25.492455"
-       sodipodi:t0="0.038965192"
-       d="m 357.71341,374.37007 c 4.26414,3.70709 -1.33671,9.32671 -5.07702,10.22323 -8.90331,2.13404 -16.0483,-6.51539 -16.54354,-14.67451 -0.80844,-13.31906 11.72945,-23.06078 24.27201,-22.86385 17.66382,0.27733 30.16537,16.97051 29.18416,33.8695 -1.27726,21.99757 -22.22018,37.31028 -43.467,35.50447 -26.32945,-2.23779 -44.47651,-27.47377 -41.82478,-53.06449 3.17716,-30.66134 32.72957,-51.65542 62.66199,-48.14509 34.99363,4.10388 58.84245,37.98678 54.46539,72.25948 -4.08654,31.99797 -30.76626,56.97365 -62.46783,60.90649"
-       transform="matrix(0.94687455,0,0,0.94504253,-132.63252,-30.735009)" />
-    <path
-       sodipodi:type="star"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;stroke:#ff0000;stroke-width:8.00043869;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4180"
-       sodipodi:sides="5"
-       sodipodi:cx="355.44702"
-       sodipodi:cy="544.95685"
-       sodipodi:r1="63.245552"
-       sodipodi:r2="29.670052"
-       sodipodi:arg1="1.2490458"
-       sodipodi:arg2="1.9640381"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 375.44702,604.95685 -31.36911,-32.59461 -39.51394,10.15676 21.30573,-39.90609 -21.87013,-34.44138 44.53677,7.9313 25.99746,-31.4427 6.21951,44.80789 37.93744,15.00872 -40.6929,19.76151 z"
-       inkscape:transform-center-x="-5.9400951"
-       inkscape:transform-center-y="-0.15464199"
-       transform="matrix(1.0071121,0,0,1.0424461,9.7249745,-238.04457)" />
-    <g
-       sodipodi:type="inkscape:box3d"
-       id="g7229"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.6590004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       inkscape:perspectiveID="#perspective7227"
-       inkscape:corner0="-1.7750984 : -0.31587834 : 0 : 1"
-       inkscape:corner7="-1.8455619 : -0.40889015 : 0.12606765 : 1">
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7235"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="3"
-         d="m 555.62147,331.42703 36.40926,-14.71656 -48.22635,-50.02313 -40.79348,10.169 z"
-         points="592.03073,316.71047 543.80438,266.68734 503.0109,276.85634 555.62147,331.42703 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7231"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="6"
-         d="m 555.62147,331.42703 -52.61057,-54.57069 -27.47164,51.06363 62.82964,65.17049 z"
-         points="503.0109,276.85634 475.53926,327.91997 538.3689,393.09046 555.62147,331.42703 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7233"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="5"
-         d="m 555.62147,331.42703 36.40926,-14.71656 -9.18342,53.04584 -44.47841,23.33415 z"
-         points="592.03073,316.71047 582.84731,369.75631 538.3689,393.09046 555.62147,331.42703 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7241"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="11"
-         d="m 538.3689,393.09046 44.47841,-23.33415 -56.67643,-58.78803 -50.63162,16.95169 z"
-         points="582.84731,369.75631 526.17088,310.96828 475.53926,327.91997 538.3689,393.09046 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7239"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="13"
-         d="m 503.0109,276.85634 40.79348,-10.169 -17.6335,44.28094 -50.63162,16.95169 z"
-         points="543.80438,266.68734 526.17088,310.96828 475.53926,327.91997 503.0109,276.85634 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7237"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="14"
-         d="m 592.03073,316.71047 -48.22635,-50.02313 -17.6335,44.28094 56.67643,58.78803 z"
-         points="543.80438,266.68734 526.17088,310.96828 582.84731,369.75631 592.03073,316.71047 " />
-    </g>
-  </g>
-</svg>
diff --git a/assets/themes/advertising/Indication_post.svg b/assets/themes/advertising/Indication_post.svg
deleted file mode 100644
index 8b7ca2f53c..0000000000
--- a/assets/themes/advertising/Indication_post.svg
+++ /dev/null
@@ -1,232 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 15371"
-   sodipodi:docname="Indication_post.svg">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="1063.7116 : 860.59036 : 1"
-       inkscape:vp_y="-491.90589 : 452.23512 : 0"
-       inkscape:vp_z="673.15684 : 1000.6711 : 1"
-       inkscape:persp3d-origin="1288.2911 : 1139.5644 : 1"
-       id="perspective7227" />
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
-      <path
-         id="path5776"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#ff0015;stroke-opacity:1;fill:#ff0015;fill-opacity:1"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) rotate(180) translate(0,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
-      <path
-         id="path5770"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#fffef3;stroke-opacity:1;fill:#fffef3;fill-opacity:1"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
-      <path
-         id="path5752"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#fffef3;stroke-width:1pt;stroke-opacity:1;fill:#fffef3;fill-opacity:1"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.29884505"
-     inkscape:cx="-617.76215"
-     inkscape:cy="1048.9934"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1553"
-     inkscape:window-height="876"
-     inkscape:window-x="47"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4298" />
-  </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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#fffe73;fill-opacity:1;stroke:#ff0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4221-7-5"
-       width="561.00653"
-       height="290.81378"
-       x="88.403999"
-       y="237.27223" />
-    <rect
-       style="fill:#7c7c7c;fill-opacity:1;stroke:#7e7e7e;stroke-width:14.91739082;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8"
-       width="8.4997997"
-       height="279.14169"
-       x="377.16147"
-       y="537.26532" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ff0015;stroke-width:6.02354956;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
-       d="m 350.9665,484.87619 c 256.83736,0 256.83736,0 256.83736,0 l 0,0 0,0"
-       id="path5203"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.39366901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 697.68583,778.87649 Z"
-       id="path6523"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:0%;font-family:'DejaVu Serif';-inkscape-font-specification:'DejaVu Serif, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff0015;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="102.83663"
-       y="638.375"
-       id="text4305-9"
-       transform="scale(1.2690167,0.78801169)"><tspan
-         sodipodi:role="line"
-         id="tspan7348"
-         x="102.83663"
-         y="638.375"
-         style="font-size:56.90371704px;line-height:1.25">3 km</tspan><tspan
-         sodipodi:role="line"
-         id="tspan7350"
-         x="102.83663"
-         y="709.50464"
-         style="font-size:56.90371704px;line-height:1.25"> </tspan></text>
-    <path
-       sodipodi:type="spiral"
-       style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4178"
-       sodipodi:cx="354.86203"
-       sodipodi:cy="373.78302"
-       sodipodi:expansion="1"
-       sodipodi:revolution="2.2986083"
-       sodipodi:radius="74.712395"
-       sodipodi:argument="-25.492455"
-       sodipodi:t0="0.038965192"
-       d="m 357.71341,374.37007 c 4.26414,3.70709 -1.33671,9.32671 -5.07702,10.22323 -8.90331,2.13404 -16.0483,-6.51539 -16.54354,-14.67451 -0.80844,-13.31906 11.72945,-23.06078 24.27201,-22.86385 17.66382,0.27733 30.16537,16.97051 29.18416,33.8695 -1.27726,21.99757 -22.22018,37.31028 -43.467,35.50447 -26.32945,-2.23779 -44.47651,-27.47377 -41.82478,-53.06449 3.17716,-30.66134 32.72957,-51.65542 62.66199,-48.14509 34.99363,4.10388 58.84245,37.98678 54.46539,72.25948 -4.08654,31.99797 -30.76626,56.97365 -62.46783,60.90649"
-       transform="matrix(1.062387,0,0,0.93980447,-198.71611,7.237072)" />
-    <path
-       sodipodi:type="star"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;stroke:#ff0000;stroke-width:8.00043829;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4180"
-       sodipodi:sides="5"
-       sodipodi:cx="355.44702"
-       sodipodi:cy="544.95685"
-       sodipodi:r1="63.245552"
-       sodipodi:r2="29.670052"
-       sodipodi:arg1="1.2490458"
-       sodipodi:arg2="1.9640381"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 375.44702,604.95685 -31.36911,-32.59461 -39.51394,10.15676 21.30573,-39.90609 -21.87013,-34.44138 44.53677,7.9313 25.99746,-31.4427 6.21951,44.80789 37.93744,15.00872 -40.6929,19.76151 z"
-       inkscape:transform-center-x="-6.6647706"
-       inkscape:transform-center-y="-0.15374529"
-       transform="matrix(1.1299732,0,0,1.0366682,-38.991952,-198.92344)" />
-    <g
-       sodipodi:type="inkscape:box3d"
-       id="g7229"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.6590004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       inkscape:perspectiveID="#perspective7227"
-       inkscape:corner0="-1.7750984 : -0.31587834 : 0 : 1"
-       inkscape:corner7="-1.8455619 : -0.40889015 : 0.12606765 : 1">
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7235"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="3"
-         d="m 573.5004,367.39183 40.85093,-14.635 -54.10964,-49.74586 -45.76999,10.11265 z"
-         points="614.35133,352.75683 560.24169,303.01097 514.4717,313.12362 573.5004,367.39183 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7231"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="6"
-         d="m 573.5004,367.39183 -59.0287,-54.26821 -30.82298,50.78061 70.49443,64.80926 z"
-         points="514.4717,313.12362 483.64872,363.90423 554.14315,428.71349 573.5004,367.39183 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7233"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="5"
-         d="m 573.5004,367.39183 40.85093,-14.635 -10.30372,52.75185 -49.90446,23.20481 z"
-         points="614.35133,352.75683 604.04761,405.50868 554.14315,428.71349 573.5004,367.39183 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7241"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="11"
-         d="m 554.14315,428.71349 49.90446,-23.20481 -63.59058,-58.46219 -56.80831,16.85774 z"
-         points="604.04761,405.50868 540.45703,347.04649 483.64872,363.90423 554.14315,428.71349 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7239"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="13"
-         d="m 514.4717,313.12362 45.76999,-10.11265 -19.78466,44.03552 -56.80831,16.85774 z"
-         points="560.24169,303.01097 540.45703,347.04649 483.64872,363.90423 514.4717,313.12362 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7237"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="14"
-         d="m 614.35133,352.75683 -54.10964,-49.74586 -19.78466,44.03552 63.59058,58.46219 z"
-         points="560.24169,303.01097 540.45703,347.04649 604.04761,405.50868 614.35133,352.75683 " />
-    </g>
-  </g>
-</svg>
diff --git a/assets/themes/advertising/Indication_wall.svg b/assets/themes/advertising/Indication_wall.svg
deleted file mode 100644
index 020f6a2a54..0000000000
--- a/assets/themes/advertising/Indication_wall.svg
+++ /dev/null
@@ -1,220 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 15371"
-   sodipodi:docname="Indication_wall.svg">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="992.53248 : 897.53393 : 1"
-       inkscape:vp_y="-438.42137 : 454.7557 : 0"
-       inkscape:vp_z="644.44241 : 1038.3954 : 1"
-       inkscape:persp3d-origin="1192.6937 : 1178.0628 : 1"
-       id="perspective7227" />
-    <marker
-       inkscape:stockid="Arrow2Mend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Mend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
-      <path
-         id="path5776"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#ff0015;stroke-opacity:1;fill:#ff0015;fill-opacity:1"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(0.6) rotate(180) translate(0,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow2Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow2Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
-      <path
-         id="path5770"
-         style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#fffef3;stroke-opacity:1;fill:#fffef3;fill-opacity:1"
-         d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
-         transform="scale(1.1) rotate(180) translate(1,0)" />
-    </marker>
-    <marker
-       inkscape:stockid="Arrow1Lend"
-       orient="auto"
-       refY="0.0"
-       refX="0.0"
-       id="Arrow1Lend"
-       style="overflow:visible;"
-       inkscape:isstock="true">
-      <path
-         id="path5752"
-         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
-         style="fill-rule:evenodd;stroke:#fffef3;stroke-width:1pt;stroke-opacity:1;fill:#fffef3;fill-opacity:1"
-         transform="scale(0.8) rotate(180) translate(12.5,0)" />
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.5976901"
-     inkscape:cx="-58.783074"
-     inkscape:cy="635.13235"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1553"
-     inkscape:window-height="876"
-     inkscape:window-x="47"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4298" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#fffe73;fill-opacity:1;stroke:#ff0000;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4221-7-5"
-       width="492.1875"
-       height="328.125"
-       x="121.875"
-       y="199.96101" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#ff0015;stroke-width:5.70248604;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker-end:url(#Arrow2Mend)"
-       d="m 357.28356,449.56629 c 228.91165,0 228.91165,0 228.91165,0 v 0 0"
-       id="path5203"
-       inkscape:connector-curvature="0" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.39366901px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 697.68583,778.87649 Z"
-       id="path6523"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:75.0201416px;line-height:0%;font-family:'DejaVu Serif';-inkscape-font-specification:'DejaVu Serif, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ff0015;fill-opacity:1;stroke:none;stroke-width:6.25164795px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="167.83611"
-       y="440.87018"
-       id="text4305-9"
-       transform="scale(0.93242752,1.0724694)"><tspan
-         sodipodi:role="line"
-         id="tspan4581"
-         x="167.83611"
-         y="440.87018"
-         style="stroke-width:6.25164795px">3 km</tspan></text>
-    <path
-       sodipodi:type="spiral"
-       style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4178"
-       sodipodi:cx="354.86203"
-       sodipodi:cy="373.78302"
-       sodipodi:expansion="1"
-       sodipodi:revolution="2.2986083"
-       sodipodi:radius="74.712395"
-       sodipodi:argument="-25.492455"
-       sodipodi:t0="0.038965192"
-       d="m 357.71341,374.37007 c 4.26414,3.70709 -1.33671,9.32671 -5.07702,10.22323 -8.90331,2.13404 -16.0483,-6.51539 -16.54354,-14.67451 -0.80844,-13.31906 11.72945,-23.06078 24.27201,-22.86385 17.66382,0.27733 30.16537,16.97051 29.18416,33.8695 -1.27726,21.99757 -22.22018,37.31028 -43.467,35.50447 -26.32945,-2.23779 -44.47651,-27.47377 -41.82478,-53.06449 3.17716,-30.66134 32.72957,-51.65542 62.66199,-48.14509 34.99363,4.10388 58.84245,37.98678 54.46539,72.25948 -4.08654,31.99797 -30.76626,56.97365 -62.46783,60.90649"
-       transform="matrix(0.94687455,0,0,0.94504253,-132.63252,-30.735009)" />
-    <path
-       sodipodi:type="star"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;stroke:#ff0000;stroke-width:8.00043869;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4180"
-       sodipodi:sides="5"
-       sodipodi:cx="355.44702"
-       sodipodi:cy="544.95685"
-       sodipodi:r1="63.245552"
-       sodipodi:r2="29.670052"
-       sodipodi:arg1="1.2490458"
-       sodipodi:arg2="1.9640381"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="m 375.44702,604.95685 -31.36911,-32.59461 -39.51394,10.15676 21.30573,-39.90609 -21.87013,-34.44138 44.53677,7.9313 25.99746,-31.4427 6.21951,44.80789 37.93744,15.00872 -40.6929,19.76151 z"
-       inkscape:transform-center-x="-5.9400951"
-       inkscape:transform-center-y="-0.15464199"
-       transform="matrix(1.0071121,0,0,1.0424461,9.7249745,-238.04457)" />
-    <g
-       sodipodi:type="inkscape:box3d"
-       id="g7229"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.6590004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       inkscape:perspectiveID="#perspective7227"
-       inkscape:corner0="-1.7750984 : -0.31587834 : 0 : 1"
-       inkscape:corner7="-1.8455619 : -0.40889015 : 0.12606765 : 1">
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7235"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="3"
-         d="m 555.62147,331.42703 36.40926,-14.71656 -48.22635,-50.02313 -40.79348,10.169 z"
-         points="592.03073,316.71047 543.80438,266.68734 503.0109,276.85634 555.62147,331.42703 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7231"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="6"
-         d="m 555.62147,331.42703 -52.61057,-54.57069 -27.47164,51.06363 62.82964,65.17049 z"
-         points="503.0109,276.85634 475.53926,327.91997 538.3689,393.09046 555.62147,331.42703 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7233"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="5"
-         d="m 555.62147,331.42703 36.40926,-14.71656 -9.18342,53.04584 -44.47841,23.33415 z"
-         points="592.03073,316.71047 582.84731,369.75631 538.3689,393.09046 555.62147,331.42703 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7241"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="11"
-         d="m 538.3689,393.09046 44.47841,-23.33415 -56.67643,-58.78803 -50.63162,16.95169 z"
-         points="582.84731,369.75631 526.17088,310.96828 475.53926,327.91997 538.3689,393.09046 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7239"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="13"
-         d="m 503.0109,276.85634 40.79348,-10.169 -17.6335,44.28094 -50.63162,16.95169 z"
-         points="543.80438,266.68734 526.17088,310.96828 475.53926,327.91997 503.0109,276.85634 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7237"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:6.90863323;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="14"
-         d="m 592.03073,316.71047 -48.22635,-50.02313 -17.6335,44.28094 56.67643,58.78803 z"
-         points="543.80438,266.68734 526.17088,310.96828 582.84731,369.75631 592.03073,316.71047 " />
-    </g>
-  </g>
-</svg>
diff --git a/assets/themes/advertising/JEI_3.svg b/assets/themes/advertising/JEI_3.svg
deleted file mode 100644
index 81f85dc41b..0000000000
--- a/assets/themes/advertising/JEI_3.svg
+++ /dev/null
@@ -1,121 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
-   id="svg8532"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="JEI3_3.svg">
-  <defs
-     id="defs8534" />
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="0.175"
-     inkscape:cx="-564.71852"
-     inkscape:cy="0.43478815"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1535"
-     inkscape:window-height="876"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid9080" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata8537">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <g
-       id="g9110"
-       style="fill:#000000;fill-opacity:1;stroke:#2c6823;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       transform="matrix(0.99722266,0,0,1.0000373,0.3772123,2.6352865)">
-      <rect
-         y="77.790833"
-         x="124.963"
-         height="366.91931"
-         width="501.42053"
-         id="rect7422-8-4"
-         style="fill:#000000;fill-opacity:1;stroke:#2c6823;stroke-width:10;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-    <rect
-       style="fill:#76fe89;fill-opacity:1;stroke:#2c6823;stroke-width:24.91833305;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8"
-       width="11.873252"
-       height="557.59143"
-       x="369.20731"
-       y="461.82748" />
-    <rect
-       style="fill:#2c6823;fill-opacity:1;stroke:#2c6823;stroke-width:0;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8-4-2"
-       width="540"
-       height="54.066139"
-       x="105.00001"
-       y="36.715485" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:50px;line-height:125%;font-family:'Century Schoolbook L';-inkscape-font-specification:'Century Schoolbook L, Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#fff900;fill-opacity:1;stroke:#686423;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="123.95176"
-       y="204.64833"
-       id="text16055"
-       sodipodi:linespacing="125%"
-       transform="scale(1.2027765,0.83140964)"><tspan
-         sodipodi:role="line"
-         id="tspan16059"
-         x="123.95176"
-         y="204.64833">AUJOURD'HUI</tspan><tspan
-         sodipodi:role="line"
-         id="tspan16061"
-         x="123.95176"
-         y="267.14835">     8H / 13H</tspan><tspan
-         sodipodi:role="line"
-         id="tspan16063"
-         x="123.95176"
-         y="329.64835"> MARCHÉ DE </tspan><tspan
-         sodipodi:role="line"
-         id="tspan16065"
-         x="123.95176"
-         y="392.14832">   PLEIN VENT</tspan></text>
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:43.75px;line-height:125%;font-family:'Century Schoolbook L';-inkscape-font-specification:'Century Schoolbook L, Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="144.99217"
-       y="79.869102"
-       id="text16075"
-       sodipodi:linespacing="125%"><tspan
-         sodipodi:role="line"
-         id="tspan8708"
-         x="144.99217"
-         y="79.869102">Commune de Bergerac</tspan></text>
-  </g>
-</svg>
diff --git a/assets/themes/advertising/Newspaper_kiosk_3.svg b/assets/themes/advertising/Newspaper_kiosk.svg
similarity index 94%
rename from assets/themes/advertising/Newspaper_kiosk_3.svg
rename to assets/themes/advertising/Newspaper_kiosk.svg
index d18e432c5e..debaea46b5 100644
--- a/assets/themes/advertising/Newspaper_kiosk_3.svg
+++ b/assets/themes/advertising/Newspaper_kiosk.svg
@@ -2,20 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    width="210mm"
    height="297mm"
    viewBox="0 0 744.09448819 1052.3622047"
    id="svg2"
    version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="Newspaper_kiosk3_3.svg">
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="Newspaper_kiosk.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <inkscape:perspective
@@ -33,17 +33,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.45254832"
-     inkscape:cx="624.76104"
-     inkscape:cy="713.05841"
+     inkscape:zoom="1.2429549"
+     inkscape:cx="423.98963"
+     inkscape:cy="581.2761"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1535"
-     inkscape:window-height="876"
-     inkscape:window-x="65"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
+     inkscape:window-width="1920"
+     inkscape:window-height="995"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="0">
     <inkscape:grid
        type="xygrid"
        id="grid4298" />
@@ -56,7 +57,6 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -246,20 +246,6 @@
        id="path3518"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccc" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-size:102.90770721px;line-height:125%;font-family:'Century Schoolbook L';-inkscape-font-specification:'Century Schoolbook L, Medium';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="103.45692"
-       y="404.74234"
-       id="text16665"
-       sodipodi:linespacing="125%"
-       inkscape:transform-center-x="-31.251785"
-       inkscape:transform-center-y="7.868328"
-       transform="scale(0.9394854,1.0644125)"><tspan
-         sodipodi:role="line"
-         id="tspan16667"
-         x="103.45692"
-         y="404.74234">ELLE</tspan></text>
     <ellipse
        style="opacity:1;fill:#2c6823;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:3.47030473;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path6557"
@@ -341,7 +327,7 @@
        sodipodi:argument="-25.492455"
        sodipodi:t0="0.038965192"
        d="m 357.71341,374.37007 c 4.26414,3.70709 -1.33671,9.32671 -5.07702,10.22323 -8.90331,2.13404 -16.0483,-6.51539 -16.54354,-14.67451 -0.80844,-13.31906 11.72945,-23.06078 24.27201,-22.86385 17.66382,0.27733 30.16537,16.97051 29.18416,33.8695 -1.27726,21.99757 -22.22018,37.31028 -43.467,35.50447 -26.32945,-2.23779 -44.47651,-27.47377 -41.82478,-53.06449 3.17716,-30.66134 32.72957,-51.65542 62.66199,-48.14509 34.99363,4.10388 58.84245,37.98678 54.46539,72.25948 -4.08654,31.99797 -30.76626,56.97365 -62.46783,60.90649"
-       transform="matrix(1.5886153,0,0,1.4132116,-353.29651,41.265149)" />
+       transform="matrix(1.5886153,0,0,1.4132116,-353.29651,-3.734851)" />
     <ellipse
        style="opacity:1;fill:#2c6823;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path6557-2"
diff --git a/assets/themes/advertising/Political_Board_3.svg b/assets/themes/advertising/Political_Board_3.svg
deleted file mode 100644
index b7e202ba31..0000000000
--- a/assets/themes/advertising/Political_Board_3.svg
+++ /dev/null
@@ -1,115 +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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.92.1 15371"
-   sodipodi:docname="Political_Board_3.svg">
-  <defs
-     id="defs4">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="1063.7116 : 820.59039 : 1"
-       inkscape:vp_y="-491.90589 : 452.23512 : 0"
-       inkscape:vp_z="673.15686 : 960.67113 : 1"
-       inkscape:persp3d-origin="1288.2911 : 1099.5644 : 1"
-       id="perspective7227" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1.2774832"
-     inkscape:cx="276.24699"
-     inkscape:cy="637.43881"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="1553"
-     inkscape:window-height="876"
-     inkscape:window-x="47"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4298" />
-  </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 />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1">
-    <rect
-       style="fill:#7c7c7c;fill-opacity:1;stroke:#656565;stroke-width:14.13415623;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8-4"
-       width="402.11584"
-       height="304.61584"
-       x="194.56708"
-       y="309.42929" />
-    <rect
-       style="fill:#7c7c7c;fill-opacity:1;stroke:#656565;stroke-width:10.43360233;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8"
-       width="8.3163977"
-       height="139.56639"
-       x="216.1543"
-       y="626.32904" />
-    <rect
-       style="fill:#2c6823;fill-opacity:1;stroke:#656565;stroke-width:10.43360138;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect7422-8-0"
-       width="8.3163986"
-       height="139.56641"
-       x="553.72968"
-       y="626.32904" />
-    <rect
-       style="fill:#75b0ff;fill-opacity:1;stroke:#3955f9;stroke-width:9.30446434;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4683"
-       width="175.54144"
-       height="134.64572"
-       x="212.22928"
-       y="336.46649" />
-    <rect
-       style="fill:#ff75ee;fill-opacity:1;stroke:#f939bf;stroke-width:9.30446434;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="rect4683-3"
-       width="175.54144"
-       height="134.64572"
-       x="403.20786"
-       y="336.46649" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:123.88310242px;line-height:77.42736816px;font-family:'DejaVu Serif';-inkscape-font-specification:'DejaVu Serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:65.78704834;stroke-miterlimit:4;stroke-dasharray:none"
-       x="285.52011"
-       y="457.22934"
-       id="text4689"
-       transform="scale(0.75772161,1.3197459)"><tspan
-         sodipodi:role="line"
-         id="tspan4687"
-         x="285.52011"
-         y="457.22934"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:123.88310242px;font-family:'DejaVu Serif';-inkscape-font-specification:'DejaVu Serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:65.78704834;stroke-miterlimit:4;stroke-dasharray:none">VOTE !</tspan></text>
-  </g>
-</svg>
diff --git a/assets/themes/advertising/Poster_box.svg b/assets/themes/advertising/Poster_box.svg
index 9f6e3d5843..472d6e9175 100644
--- a/assets/themes/advertising/Poster_box.svg
+++ b/assets/themes/advertising/Poster_box.svg
@@ -2,28 +2,28 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
+   width="133.98367mm"
+   height="246.87013mm"
+   viewBox="0 0 474.7453 874.73669"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.0 15301"
-   sodipodi:docname="Poster_box.svg">
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="Poster_box.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="959.3555 : 586.8714 : 1"
-       inkscape:vp_y="-556.68369 : 511.78878 : 0"
-       inkscape:vp_z="517.36958 : 745.399 : 1"
-       inkscape:persp3d-origin="1213.5093 : 902.58279 : 1"
+       inkscape:vp_x="793.93998 : 527.81061 : 1"
+       inkscape:vp_y="-556.6837 : 511.78875 : 0"
+       inkscape:vp_z="351.95405 : 686.3382 : 1"
+       inkscape:persp3d-origin="1048.0938 : 843.52198 : 1"
        id="perspective7227" />
   </defs>
   <sodipodi:namedview
@@ -33,20 +33,23 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.979899"
-     inkscape:cx="558.14751"
-     inkscape:cy="416.3596"
+     inkscape:zoom="0.76207568"
+     inkscape:cx="153.52806"
+     inkscape:cy="532.09938"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1553"
-     inkscape:window-height="876"
-     inkscape:window-x="47"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1">
+     inkscape:window-width="1920"
+     inkscape:window-height="995"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="0">
     <inkscape:grid
        type="xygrid"
-       id="grid4298" />
+       id="grid4298"
+       originx="-154.57584"
+       originy="-91.827049" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -56,37 +59,37 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-154.57585,-91.827051)">
     <rect
-       style="fill:#999999;fill-opacity:0;stroke:#999999;stroke-width:18.15800095;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:0;stroke:#999999;stroke-width:18.158;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4219-8-7-3"
        width="420.01941"
        height="636.29248"
        x="191.07091"
        y="110.05134" />
     <rect
-       style="fill:#999999;fill-opacity:0;stroke:#999999;stroke-width:18.15800095;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:0;stroke:#999999;stroke-width:18.158;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4219-8-7-6"
        width="420.01941"
        height="636.29248"
        x="200.22273"
        y="100.90605" />
     <rect
-       style="fill:#999999;fill-opacity:0;stroke:#999999;stroke-width:18.15800095;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:0;stroke:#999999;stroke-width:18.158;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4219-8-7"
        width="420.01941"
        height="636.29248"
        x="181.98607"
        y="119.14932" />
     <rect
-       style="fill:#999999;fill-opacity:0;stroke:#999999;stroke-width:18.15800095;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:0;stroke:#999999;stroke-width:18.158;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4219-8"
        width="420.01941"
        height="636.29248"
@@ -100,14 +103,14 @@
        x="161.06851"
        y="145.01726" />
     <rect
-       style="fill:#500000;fill-opacity:0;stroke:#999999;stroke-width:18.158;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;stroke-linejoin:bevel"
+       style="fill:#500000;fill-opacity:0;stroke:#999999;stroke-width:18.158;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4219"
        width="420.01941"
        height="636.29248"
        x="163.65485"
        y="137.5267" />
     <rect
-       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:43.78704453;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:43.787;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect7422"
        width="159.03918"
        height="128.539"
@@ -147,55 +150,55 @@
     <g
        sodipodi:type="inkscape:box3d"
        id="g7229"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.6590004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.659;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        inkscape:perspectiveID="#perspective7227"
        inkscape:corner0="-1.7750984 : -0.31587834 : 0 : 1"
        inkscape:corner7="-1.8455619 : -0.40889015 : 0.12606765 : 1">
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7235"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25860786;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25861;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="3"
-         d="m 404.58965,664.23771 46.23049,-16.56225 -61.2352,-56.29676 -51.79733,11.44435 z"
-         points="450.82014,647.67546 389.58494,591.3787 337.78761,602.82305 404.58965,664.23771 " />
+         d="m 393.74995,637.5 46.2305,-16.56225 -61.23521,-56.29676 -51.79733,11.44435 z"
+         points="439.98045,620.93775 378.74524,564.64099 326.94791,576.08534 393.74995,637.5 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7231"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25860786;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25861;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="6"
-         d="m 404.58965,664.23771 -66.80204,-61.41466 -34.88198,57.46778 79.77766,73.34383 z"
-         points="337.78761,602.82305 302.90563,660.29083 382.68329,733.63466 404.58965,664.23771 " />
+         d="m 393.74995,637.5 -66.80204,-61.41466 -34.88199,57.46778 79.77767,73.34382 z"
+         points="326.94791,576.08534 292.06592,633.55312 371.84359,706.89694 393.74995,637.5 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7233"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25860786;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25861;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="5"
-         d="m 404.58965,664.23771 46.23049,-16.56225 -11.66059,59.69859 -56.47626,26.26061 z"
-         points="450.82014,647.67546 439.15955,707.37405 382.68329,733.63466 404.58965,664.23771 " />
+         d="m 393.74995,637.5 46.2305,-16.56225 -11.6606,59.69859 -56.47626,26.2606 z"
+         points="439.98045,620.93775 428.31985,680.63634 371.84359,706.89694 393.74995,637.5 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7241"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25860786;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25861;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="11"
-         d="m 382.68329,733.63466 56.47626,-26.26061 -71.96466,-66.16091 -64.28926,19.07769 z"
-         points="439.15955,707.37405 367.19489,641.21314 302.90563,660.29083 382.68329,733.63466 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7239"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25860786;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="13"
-         d="m 337.78761,602.82305 51.79733,-11.44435 -22.39005,49.83444 -64.28926,19.07769 z"
-         points="389.58494,591.3787 367.19489,641.21314 302.90563,660.29083 337.78761,602.82305 " />
+         d="m 371.84359,706.89694 56.47626,-26.2606 -71.96466,-66.16091 -64.28927,19.07769 z"
+         points="428.31985,680.63634 356.35519,614.47543 292.06592,633.55312 371.84359,706.89694 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7237"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25860786;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25861;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="14"
-         d="m 450.82014,647.67546 -61.2352,-56.29676 -22.39005,49.83444 71.96466,66.16091 z"
-         points="389.58494,591.3787 367.19489,641.21314 439.15955,707.37405 450.82014,647.67546 " />
+         d="m 439.98045,620.93775 -61.23521,-56.29676 -22.39005,49.83444 71.96466,66.16091 z"
+         points="378.74524,564.64099 356.35519,614.47543 428.31985,680.63634 439.98045,620.93775 " />
+      <path
+         sodipodi:type="inkscape:box3dside"
+         id="path7239"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:8.25861;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:box3dsidetype="13"
+         d="m 326.94791,576.08534 51.79733,-11.44435 -22.39005,49.83444 -64.28927,19.07769 z"
+         points="378.74524,564.64099 356.35519,614.47543 292.06592,633.55312 326.94791,576.08534 " />
     </g>
     <ellipse
-       style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:17.68096542;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#999999;fill-opacity:1;fill-rule:nonzero;stroke:#999999;stroke-width:17.681;stroke-linecap:round;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="path14840"
        cx="400.40192"
        cy="947.48474"
diff --git a/assets/themes/advertising/Totem.svg b/assets/themes/advertising/Totem.svg
index d16f891905..2e97da890f 100644
--- a/assets/themes/advertising/Totem.svg
+++ b/assets/themes/advertising/Totem.svg
@@ -2,26 +2,25 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="210mm"
-   height="297mm"
-   viewBox="0 0 744.09448819 1052.3622047"
+   width="71.367188mm"
+   height="257.55438mm"
+   viewBox="0 0 252.87586 912.59427"
    id="svg2"
    version="1.1"
-   inkscape:version="0.92.1 15371"
-   sodipodi:docname="Totem.svg">
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="Totem.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
   <defs
      id="defs4">
     <linearGradient
        id="1-2"
-       osb:paint="gradient">
+       inkscape:swatch="gradient">
       <stop
          style="stop-color:#000000;stop-opacity:0;"
          offset="0"
@@ -33,7 +32,7 @@
     </linearGradient>
     <linearGradient
        id="linearGradient7260"
-       osb:paint="solid">
+       inkscape:swatch="solid">
       <stop
          style="stop-color:#999999;stop-opacity:1;"
          offset="0"
@@ -41,10 +40,10 @@
     </linearGradient>
     <inkscape:perspective
        sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="874.71153 : 630.59038 : 1"
-       inkscape:vp_y="-491.90589 : 452.23512 : 0"
-       inkscape:vp_z="484.15677 : 770.67112 : 1"
-       inkscape:persp3d-origin="1099.291 : 909.56442 : 1"
+       inkscape:vp_x="631.04484 : 539.87547 : 1"
+       inkscape:vp_y="-491.9059 : 452.2351 : 0"
+       inkscape:vp_z="240.49008 : 679.9562 : 1"
+       inkscape:persp3d-origin="855.6243 : 818.8495 : 1"
        id="perspective7227" />
   </defs>
   <sodipodi:namedview
@@ -54,24 +53,27 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="0.49497475"
-     inkscape:cx="225.96893"
-     inkscape:cy="868.47482"
+     inkscape:zoom="0.44742011"
+     inkscape:cx="326.31524"
+     inkscape:cy="588.93196"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
-     inkscape:window-width="1553"
-     inkscape:window-height="876"
-     inkscape:window-x="47"
-     inkscape:window-y="24"
+     inkscape:window-width="1920"
+     inkscape:window-height="995"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="1"
-     showguides="false">
+     showguides="false"
+     inkscape:pagecheckerboard="0">
     <inkscape:grid
        type="xygrid"
        id="grid4298"
        spacingx="0.09375"
        spacingy="0.09375"
-       snapvisiblegridlinesonly="false" />
+       snapvisiblegridlinesonly="false"
+       originx="-239.36593"
+       originy="-69.287831" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -81,22 +83,22 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1">
+     id="layer1"
+     transform="translate(-239.36594,-69.287832)">
     <path
-       style="fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:4.44632339;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:4.44632;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 277.66758,950.95882 198.41598,-0.41446 c 0,0 12.50491,4.01769 13.61247,7.13538 1.56621,4.40906 -2.49298,9.92048 -10.56866,14.34965 -5.71041,3.13191 -24.18108,7.21431 -24.18108,7.21431 l -198.41599,0.41447 c 0,0 -12.50488,-4.01768 -13.61243,-7.13537 -1.56623,-4.40907 2.49295,-9.92048 10.56864,-14.34967 5.71039,-3.13191 24.18107,-7.21431 24.18107,-7.21431 z"
        id="path11845-5-1"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccssccaac" />
     <rect
-       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:5.06233835;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:5.06234;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect7276"
        width="246.97043"
        height="220.96555"
@@ -110,26 +112,26 @@
        x="245"
        y="953.79077" />
     <rect
-       style="fill:#fffe73;fill-opacity:1;stroke:#999999;stroke-width:19.70900536;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#fffe73;fill-opacity:1;stroke:#999999;stroke-width:19.709;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        id="rect4221-7-5"
        width="232.291"
        height="632.0105"
        x="249.85451"
        y="101.10674" />
     <path
-       style="fill:#fffe73;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:5.03406191;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#fffe73;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:5.03406;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 277.44998,726.63706 198.14377,-0.41816 c 0,0 12.48775,4.05333 13.59377,7.19863 1.56408,4.44815 -2.48955,10.00841 -10.55415,14.47684 -5.70258,3.15969 -24.14791,7.27825 -24.14791,7.27825 l -198.14379,0.41817 c 0,0 -12.48773,-4.05332 -13.59376,-7.19862 -1.56409,-4.44816 2.48955,-10.00841 10.55416,-14.47686 5.70255,-3.15969 24.14791,-7.27825 24.14791,-7.27825 z"
        id="path11845-5"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccssccaac" />
     <path
-       style="fill:#fffe73;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:6.29871082;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       style="fill:#fffe73;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:6.29871;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="m 277.44451,72.880085 197.60391,-0.441721 c 0,0 12.45374,4.281941 13.55675,7.604659 1.55982,4.699041 -2.48278,10.572925 -10.52538,15.2934 -5.68705,3.337916 -24.08215,7.688777 -24.08215,7.688777 l -197.60391,0.44174 c 0,0 -12.45373,-4.281918 -13.55674,-7.604641 -1.55982,-4.699058 2.48276,-10.572927 10.52542,-15.293431 5.68701,-3.337897 24.0821,-7.688783 24.0821,-7.688783 z"
        id="path11845"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccssccaac" />
     <rect
-       style="opacity:1;fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:3.70716047;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:3.70716;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect11895"
        width="0.86569679"
        height="8.2228403"
@@ -150,34 +152,34 @@
        x="264.10516"
        y="708.01154" />
     <rect
-       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#999999;stroke-width:3.02409124;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#999999;stroke-width:3.02409;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect11847"
        width="1.1134398"
        height="7.1867266"
        x="483.49316"
        y="93.758133" />
     <rect
-       style="opacity:1;fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:11.31801605;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#999999;fill-opacity:1;stroke:#999999;stroke-width:11.318;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect11847-9"
        width="8.6744719"
        height="12.921288"
        x="245.85678"
        y="729.45007" />
     <rect
-       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#999999;stroke-width:10.58939648;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#999999;stroke-width:10.5894;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect11847-9-7"
        width="9.2615595"
        height="10.594157"
        x="477.41241"
        y="722.17432" />
     <path
-       style="fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:0.94270563px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:0.942706px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 472.2276,734.27145 0.17865,13.29458 5.02956,-2.14132 4.08391,-2.26821 4.24615,-4.46884 1.44452,-4.15446 z"
        id="path12440"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="ccccccc" />
     <path
-       style="fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:1.96941066px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       style="fill:#999999;fill-opacity:1;fill-rule:evenodd;stroke:#999999;stroke-width:1.96941px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
        d="m 242.185,724.52365 15.28949,-0.50126 0.59616,27.93764 -4.27083,-0.17857 -2.69502,-0.73175 -2.1873,-1.45805 -5.15881,-3.26017 -0.86315,-7.13347 -0.33955,-8.22212 z"
        id="path12442"
        inkscape:connector-curvature="0"
@@ -221,7 +223,7 @@
        x="259.46436"
        y="703.70593" />
     <rect
-       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#999999;stroke-width:5.53973198;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#2c6823;fill-opacity:1;stroke:#999999;stroke-width:5.53973;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        id="rect11847-9-7-7"
        width="1.5569199"
        height="17.247229"
@@ -230,52 +232,52 @@
     <g
        sodipodi:type="inkscape:box3d"
        id="g7229"
-       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.6590004;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       style="opacity:1;fill:#b5befe;fill-opacity:1;fill-rule:nonzero;stroke:#ff0000;stroke-width:8.659;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
        inkscape:perspectiveID="#perspective7227"
        inkscape:corner0="-1.7750984 : -0.31587834 : 0 : 1"
        inkscape:corner7="-1.8455619 : -0.40889015 : 0.12606765 : 1">
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7235"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="3"
-         d="m 384.50037,597.39181 40.85093,-14.635 -54.10965,-49.74586 -45.76999,10.11264 z"
-         points="425.3513,582.75681 371.24165,533.01095 325.47166,543.12359 384.50037,597.39181 " />
+         d="m 380.19963,617.62659 40.85093,-14.635 -54.10965,-49.74586 -45.76999,10.11265 z"
+         points="421.05056,602.99159 366.94091,553.24573 321.17092,563.35838 380.19963,617.62659 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7231"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="6"
-         d="m 384.50037,597.39181 -59.02871,-54.26822 -30.82298,50.78062 70.49444,64.80926 z"
-         points="325.47166,543.12359 294.64868,593.90421 365.14312,658.71347 384.50037,597.39181 " />
+         d="m 380.19963,617.62659 -59.02871,-54.26821 -30.82297,50.78061 70.49443,64.80926 z"
+         points="321.17092,563.35838 290.34795,614.13899 360.84238,678.94825 380.19963,617.62659 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7233"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="5"
-         d="m 384.50037,597.39181 40.85093,-14.635 -10.30372,52.75184 -49.90446,23.20482 z"
-         points="425.3513,582.75681 415.04758,635.50865 365.14312,658.71347 384.50037,597.39181 " />
+         d="m 380.19963,617.62659 40.85093,-14.635 -10.30372,52.75184 -49.90446,23.20482 z"
+         points="421.05056,602.99159 410.74684,655.74343 360.84238,678.94825 380.19963,617.62659 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7241"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="11"
-         d="M 365.14312,658.71347 415.04758,635.50865 351.457,577.04646 294.64868,593.90421 Z"
-         points="415.04758,635.50865 351.457,577.04646 294.64868,593.90421 365.14312,658.71347 " />
-      <path
-         sodipodi:type="inkscape:box3dside"
-         id="path7239"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         inkscape:box3dsidetype="13"
-         d="m 325.47166,543.12359 45.76999,-10.11264 -19.78465,44.03551 -56.80832,16.85775 z"
-         points="371.24165,533.01095 351.457,577.04646 294.64868,593.90421 325.47166,543.12359 " />
+         d="m 360.84238,678.94825 49.90446,-23.20482 -63.59058,-58.46218 -56.80831,16.85774 z"
+         points="410.74684,655.74343 347.15626,597.28125 290.34795,614.13899 360.84238,678.94825 " />
       <path
          sodipodi:type="inkscape:box3dside"
          id="path7237"
-         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29760504;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          inkscape:box3dsidetype="14"
-         d="m 425.3513,582.75681 -54.10965,-49.74586 -19.78465,44.03551 63.59058,58.46219 z"
-         points="371.24165,533.01095 351.457,577.04646 415.04758,635.50865 425.3513,582.75681 " />
+         d="m 421.05056,602.99159 -54.10965,-49.74586 -19.78465,44.03552 63.59058,58.46218 z"
+         points="366.94091,553.24573 347.15626,597.28125 410.74684,655.74343 421.05056,602.99159 " />
+      <path
+         sodipodi:type="inkscape:box3dside"
+         id="path7239"
+         style="fill:#b5befe;fill-opacity:1;fill-rule:evenodd;stroke:#ff0000;stroke-width:7.29761;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:box3dsidetype="13"
+         d="m 321.17092,563.35838 45.76999,-10.11265 -19.78465,44.03552 -56.80831,16.85774 z"
+         points="366.94091,553.24573 347.15626,597.28125 290.34795,614.13899 321.17092,563.35838 " />
     </g>
   </g>
 </svg>
diff --git a/assets/themes/advertising/advertising.json b/assets/themes/advertising/advertising.json
index 7436a1273a..af47c45d8e 100644
--- a/assets/themes/advertising/advertising.json
+++ b/assets/themes/advertising/advertising.json
@@ -1,786 +1,721 @@
+{
+  "id": "advertising",
+  "credits": "Offsel",
+  "title": {
+    "ca": "Publicitat",
+    "es": "Publicidad",
+    "en": "Advertising"
+  },
+  "shortDescription": {
+    "ca": "Completar dades sobre publicitat",
+    "es": "Completar datos sobre publicidad",
+    "en": "Complete data about advertising"
+  },
+  "description": {
+    "ca": "Afegir dades de dispositius publicitaris",
+    "es": "Añadir datos de dispositivos publicitarios",
+    "en": "Add data of advertising devices"
+  },
+  "maintainer": "Offsel",
+  "icon": "./assets/themes/advertising/icon.svg",
+  "version": "2023_01_23",
+  "startLat": 0,
+  "startLon": 0,
+  "startZoom": 1,
+  "widenFactor": 0.01,
+  "socialImage": "",
+  "layers": [
     {
-        "id": "advertising",
-        "credits": "Offsel",
-        "title": {
+      "id": "advertising",
+      "name": {
         "ca": "Publicitat",
         "es": "Publicidad",
-        "en": "Advertising"
+        "en": "Advertise"
+      },
+      "minzoom": 15,
+      "source": {
+        "osmTags": "advertising~*"
+      },
+      "title": {
+        "render": {
+          "*": "{advertising}"
         },
-        "shortDescription": {
-        "ca": "Completar dades sobre publicitat",
-        "es": "Completar datos sobre publicidad",
-        "en": "Complete data about advertising"
-        },
-        "description": {
-        "ca": "Afegir dades de dispositius publicitaris",
-        "es": "Añadir datos de dispositivos publicitarios",
-        "en": "Add data of advertising devices"
-        },
-        "language": [
-        "ca",
-        "es",
-        "en"
-        ],
-        "maintainer": "Offsel",
-        "icon": "Advertising_icon.svg",
-        "version": "2023_01_23",
-        "startLat": 0,
-        "startLon": 0,
-        "startZoom": 1,
-        "widenFactor": 0.01,
-        "socialImage": "",
-        "layers": [
-        {
-            "id": "advertising",
-            "name": {
-            "ca": "Publicitat",
-            "es": "Publicidad",
-            "en": "Advertise"
-            },
-            "minzoom": 15,
-            "overpassTags": {
-            "or": [
-                "advertising~*"
-            ]
-            },
-            "title": {
-            "render": {
-                "*": "{advertising}"
-            },
-            "mappings": [
-                {
-                  "if": {
-                    "and": [
-                      "advertising=billboard"
-                    ]
-                  },
-                  "then": {
-                    "ca": "Tanca publicitària",
-                    "es": "Valla publicitaria",
-                    "en": "Billboard"
-                  }
-                },
-                {
-                  "if": {
-                    "and": [
-                      "advertising=board"
-                    ]
-                  },
-                  "then": {
-                    "ca": "Tauló d'anuncis",
-                    "es": "Tablon de anuncios",
-                    "en": "Board"
-                  }
-                },
-                {
-                    "if": {
-                        "and":[
-                            "advertising=poster_box"
-                        ]
-                    },
-                    "then":{
-                        "ca": "Mupi",
-                        "es": "Mupi",
-                        "en": "Poster Box"
-                    }
-                },
-                {
-                    "if": {
-                        "and":[
-                            "advertising=column"
-                        ]
-                    },
-                    "then":{
-                        "ca": "Columna",
-                        "es": "Columna",
-                        "en": "Column"
-                    }
-                },
-                {
-                    "if": {
-                        "and":[
-                            "advertising=flag"
-                        ]
-                    },
-                    "then":{
-                        "ca": "Bandera",
-                        "es": "Bandera",
-                        "en": "Flag"
-                    }
-                },
-                {
-                    "if": {
-                        "and":[
-                            "advertising=screen"
-                        ]
-                    },
-                    "then":{
-                        "ca": "Pantalla",
-                        "es": "Pantalla",
-                        "en": "Screen"
-                    }
-                },
-                {
-                    "if": {
-                        "and":[
-                            "advertising=sculpture"
-                        ]
-                    },
-                    "then":{
-                        "ca": "Esculptura",
-                        "es": "Escultura",
-                        "en": "Sculpture"
-                    }
-                },
-                {
-                    "if": {
-                        "and":[
-                            "advertising=sign"
-                        ]
-                    },
-                    "then":{
-                        "ca": "Cartell",
-                        "es": "Cartel",
-                        "en": "Sign"
-                    }
-                },
-                {
-                    "if": {
-                        "and":[
-                            "advertising=tarp"
-                        ]
-                    },
-                    "then":{
-                        "ca": "Lona",
-                        "es": "Lona",
-                        "en": "Tarp"
-                    }
-                },
-                {
-                    "if": {
-                        "and":[
-                            "advertising=totem"
-                        ]
-                    },
-                    "then":{
-                        "ca": "Tòtem",
-                        "es": "Tótem",
-                        "en": "Totem"
-                    }
-                },
-                {
-                    "if": {
-                        "and":[
-                            "advertising=wall_painting"
-                        ]
-                    },
-                    "then":{
-                        "ca": "Paret Pintada",
-                        "es": "Pared Pintada",
-                        "en": "Wall Painted"
-                    }
-                }
-            ]
-            },
-            "description": {
-            "ca": "Completarem les dades dels elements publicitaris amb referència, operador i il·luminació",
-            "es": "Completaremos los datos de los elementos publicitarios con referencia, operador y iluminación",
-            "en": "We will complete data from advertising features with reference, operator and lit"
-            },
-            "tagRenderings": [
-                "images",
-                {
-                    "render": {
-                    "ca": "Açò és un {advertising}",
-                    "es": "Esto es un {advertising}",
-                    "en": "This is a {advertising}"
-                    },
-                    "question": {
-                    "ca": "Quin tipus d'element publicitari és aquest?",
-                    "es": "¿Qué tipo de elemento publicitario es?",
-                    "en": "Which type of advertising feature is this?"
-                    },
-                    "freeform": {
-                        "key": "advertising"
-                      },
-                      "mappings": [
-                        {
-                          "if": {
-                            "and": [
-                              "advertising=billboard"
-                            ]
-                          },
-                          "then": {
-                            "ca": "Açò és una tanca publicitària",
-                            "es": "Esto es una valla publicitaria",
-                            "en": "This is a billboard"
-                          }
-                        },
-                        {
-                          "if": {
-                            "and": [
-                                "advertising=board"
-                            ]
-                          },
-                          "then": {
-                            "ca": "Açò és un tauló d'anunis",
-                            "es": "Esto es un tablón de anuncios",
-                            "en": "This is a board"
-                          }
-                        },
-                        {
-                          "if": {
-                            "and": [
-                                "advertising=column"
-                            ]
-                          },
-                          "then": {
-                            "ca": "Açò és una columna",
-                            "es": "Esto es una columna",
-                            "en": "This is a column"
-                          }
-                        },
-                        {
-                            "if": {
-                              "and": [
-                                  "advertising=flag"
-                              ]
-                            },
-                            "then": {
-                              "ca": "Açò és una bandera",
-                              "es": "Esto es una bndera",
-                              "en": "This is a flag"
-                            }
-                          },
-                          {
-                            "if": {
-                              "and": [
-                                  "advertising=poster_box"
-                              ]
-                            },
-                            "then": {
-                              "ca": "Açò és un mupi",
-                              "es": "Esto es un mupi",
-                              "en": "This is a poster Box"
-                            }
-                          },
-                          {
-                            "if": {
-                              "and": [
-                                  "advertising=screen"
-                              ]
-                            },
-                            "then": {
-                              "ca": "Açò és una pantalla",
-                              "es": "Esto es una pantalla",
-                              "en": "This is a screen"
-                            }
-                          },
-                          {
-                            "if": {
-                              "and": [
-                                  "advertising=sculpture"
-                              ]
-                            },
-                            "then": {
-                              "ca": "Açò és una esculptura",
-                              "es": "Esto es una escultura",
-                              "en": "This is a sculpture"
-                            }
-                          },
-                          {
-                            "if": {
-                              "and": [
-                                  "advertising=sign"
-                              ]
-                            },
-                            "then": {
-                              "ca": "Açò és un cartell",
-                              "es": "Esto es un cartel",
-                              "en": "This is a sign"
-                            }
-                          },
-                          {
-                            "if": {
-                              "and": [
-                                  "advertising=tarp"
-                              ]
-                            },
-                            "then": {
-                              "ca": "Açò és una lona",
-                              "es": "Esto es una lona",
-                              "en": "This is a tarp"
-                            }
-                          },
-                          {
-                            "if": {
-                              "and": [
-                                  "advertising=totem"
-                              ]
-                            },
-                            "then": {
-                              "ca": "Açò és un tòtem",
-                              "es": "Esto es un tótem",
-                              "en": "This is a totem"
-                            }
-                          },
-                          {
-                            "if": {
-                              "and": [
-                                  "advertising=wall_painting"
-                              ]
-                            },
-                            "then": {
-                              "ca": "Açò és una paret pintada",
-                              "es": "Esto es una pared pintada",
-                              "en": "This is a wall painted"
-                            }
-                          }
-                    ]
-                },
-                {
-                "render": {
-                "ca": "El número de referència és {ref}",
-                "es": "El número de referencia es {ref}",
-                "en": "Reference number is {ref}"
-                },
-                "question": {
-                "ca": "Quin és el número de refèrencia?",
-                "es": "¿Cual es el número de referencia?",
-                "en": "Wich is the reference number?"
-                },
-                "freeform": {
-                "key": "ref"
-                },
-                "mappings": []
-            },
-            {
-                "render": {
-                "ca": "L'operador és {operator}",
-                "es": "El operador es {operator}",
-                "en": "Operated by {operator}"
-                },
-                "question": {
-                "ca": "Qui opera aquest element?",
-                "es": "¿Quien opera este elemento?",
-                "en": "Who operates this feature?"
-                },
-                "freeform": {
-                "addExtraTags": [],
-                "key": "operator"
-                },
-                "mappings": []
-            },
-            {
-                "render": {
-                "ca": "Iluminat {lit}",
-                "es": "Iluminado {lit}",
-                "en": "Lit {lit}"
-                },
-                "question": {
-                "ca": "Aquest element està il·luminat?",
-                "es": "Este elemento está iluminado?",
-                "en": "This feature is lit?"
-                },
-                "freeform": {
-                    "key": "lit"
-                  },
-                  "mappings": [
-                    {
-                      "if": {
-                        "and": [
-                          "lit=yes"
-                        ]
-                      },
-                      "then": {
-                        "ca": "Aquest element està il·luminat",
-                        "es": "Este elemento está iluminado",
-                        "en": "This feature is lit"
-                      }
-                    },
-                    {
-                      "if": {
-                        "and": [
-                            "lit=no"
-                        ]
-                      },
-                      "then": {
-                        "ca": "Aqust element no està il·luminat",
-                        "es": "Este elemento no está iluminado",
-                        "en": "This feature is not lit"
-                      }
-                    }
-                ]
-            },
-            {
-                "render": {
-                "ca": " Animat amb {animated}",
-                "es": "Animado con {animated}",
-                "en": "Animated with {animated}"
-                },
-                "question": {
-                "ca": "Quin tipus d'animació té aquest element?",
-                "es": "Que tipo de animació tiene este elemento?",
-                "en": "Wich type of animation has this feature?"
-                },
-                "freeform": {
-                    "key": "animated"
-                  },
-                  "mappings": [
-                    {
-                      "if": {
-                        "and": [
-                            "animated=no"
-                        ]
-                      },
-                      "then": {
-                        "ca": "<b>Estàtic</b>, sense animació",
-                        "es": "<b>Estático</b>, sin animación",
-                        "en": "<b>Static</b>, without animation"
-                      }
-                    },
-                    {
-                      "if": {
-                        "and": [
-                          "animated=yes"
-                        ]
-                      },
-                      "then": {
-                        "ca": "Si, però sense especificar",
-                        "es": "Si, pero sin especificar",
-                        "en": "Yes, but without specifying"
-                      }
-                    },
-                    {
-                      "if": {
-                        "and": [
-                            "animated=screen"
-                        ]
-                      },
-                      "then": {
-                        "ca": "una <b>Pantalla</b>",
-                        "es": "una <b>Pantalla</b>",
-                        "en": "a <b>screen</b>"
-                      }
-                    },
-                    {
-                      "if": {
-                        "and": [
-                            "animated=digital_prices"
-                        ]
-                      },
-                      "then": {
-                        "ca": "<b>Preus digitals</b>",
-                        "es": "<b>Precios digitales</b>",
-                        "en": "<b>Digital Prices</b>"
-                      }
-                    },
-                    {
-                      "if": {
-                        "and": [
-                            "animated=digital_message"
-                        ]
-                      },
-                      "then": {
-                        "ca": "un <b>Missatge digital</b>",
-                        "es": "un <b>Mensaje digital</b>",
-                        "en": "a <b>Digital message</b>"
-                      }
-                    },
-                    {
-                        "if": {
-                          "and": [
-                              "animated=travision_blades"
-                          ]
-                        },
-                        "then": {
-                          "ca": "Trivision",
-                          "es": "Trivision",
-                          "en": "Trivision"
-                        }
-                      },
-                      {
-                        "if": {
-                          "and": [
-                              "animated=winding_posters"
-                          ]
-                        },
-                        "then": {
-                          "ca": "Cartells <b>Rotatius</b>",
-                          "es": "Cartells <b>Rotatius</b>",
-                          "en": "<b>Scrolling</b> posters"
-                        }
-                      },
-                      {
-                        "if": {
-                          "and": [
-                              "animated=revolving"
-                          ]
-                        },
-                        "then": {
-                          "ca": "<b>Rota</b> sobre si mateix",
-                          "es": "<b>Rota</b> sobre si mismo",
-                          "en": "<b>Rotates</b> on itself"
-                        }
-                      }
-                ]
-            }
-            ],
-            "hideUnderlayingFeaturesMinPercentage": 0,
-            "icon": {
-            "render": "./images/Advertising_icon.svg",
-            "mappings": [
-                {
-                "if": {
-                    "or": [
-                    "advertising=billboard"
-                    ]
-                },
-                "then": {
-                    "ca": "./images/Billboard_trunk.svg",
-                    "es": "https://wiki.openstreetmap.org/w/images/d/d3/Billboard_trunk.svg"
-                }
-                },
-                {
-                "if": {
-                    "or": [
-                    "advertising=board"
-                    ]
-                },
-                "then": {
-                    "ca": "./images/Board.svg",
-                    "es": "https://wiki.openstreetmap.org/w/images/5/56/Board.svg"
-                }
-                },
-                {
-                "if": {
-                    "or": [
-                    "advertising=column"
-                    ]
-                },
-                "then": {
-                    "ca": "./images/Column.svg",
-                    "es": "https://wiki.openstreetmap.org/w/images/e/e3/Column.svg"
-                }
-                },
-                {
-                "if": {
-                    "or": [
-                    "advertising=flag"
-                    ]
-                },
-                "then": {
-                    "ca": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg",
-                    "es": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg"
-                }
-                },
-                {
-                "if": {
-                    "or": [
-                    "advertising=poster_box"
-                    ]
-                },
-                "then": {
-                    "ca": "/images/Poster_box.svg",
-                    "es": "https://wiki.openstreetmap.org/w/images/1/1f/Poster_box.svg"
-                }
-                 },
-                 {
-                 "if": {
-                     "or": [
-                     "advertising=screen"
-                    ]
-                 },
-                 "then": {
-                    "ca": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg",
-                    "es": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg"
-                 }
-                 },
-                 {
-                "if": {
-                    "or": [
-                    "advertising=sculpture"
-                    ]
-                },
-                "then": {
-                    "ca": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg",
-                    "es": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg"
-                }
-                },
-                {
-                "if": {
-                    "or": [
-                    "advertising=sign"
-                    ]
-                },
-                "then": {
-                    "ca": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg",
-                    "es": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg"
-                }
-                },
-                {
-                "if": {
-                    "or": [
-                    "advertising=tarp"
-                    ]
-                },
-                "then": {
-                    "ca": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg",
-                    "es": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg"
-                }
-                },
-                {
-                "if": {
-                    "or": [
-                    "advertising=totem"
-                    ]
-                },
-                "then": {
-                    "ca": "./images/Totem.svg",
-                    "es": "https://wiki.openstreetmap.org/w/images/2/23/Totem.svg"
-                }
-                },
-                {
-                "if": {
-                    "or": [
-                    "advertising=wall_painting"
-                    ]
-                },
-                "then": {
-                    "ca": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg",
-                    "es": "https://raw.githubusercontent.com/yopaseopor/mcquests/main/images/icones_adreces/casa_buida.svg"
-                }
-                }             
-            ]
-            },
-            "width": {
-            "render": "8"
-            },
-            "iconSize": {
-            "render": "40,40,center"
-            },
-            "color": {
-            "render": "#00f"
-            },
-            "presets": [
-            {
-                "tags": [
+        "mappings": [
+          {
+            "if": {
+              "and": [
                 "advertising=billboard"
-                ],
-                "title": {
-                "ca": "una tanca publicitària",
-                "es": "una valla publicitària"
-                },
-                "description": {
-                "ca": "Les tanques publicitàries normalment són de gran tamany i estan situades prop de les carreteres",
-                "es": "Las vallas publicitarias normalment son de gran tamanó y están situadas cerca de las carreteras"
-                }
+              ]
             },
-            {
-                "tags": [
-                "advertising=board"
-                ],
-                "title": {
-                "ca": "un tauló d'anunis",
-                "es": "un tablón de anuncios",
-                "en": "a billboard"
-                }
-            },
-            {
-                "tags": [
-                "advertising=column"
-                ],
-                "title": {
-                "ca": "una columna",
-                "es": "una columna",
-                "en": "a column"
-                }
-            },
-            {
-                "tags": [
-                "advertising=flag",
-                "man_made=pole"
-                ],
-                "title": {
-                "ca": "una bandera",
-                "es": "una bandera",
-                "en": "a flag"
-                }
-            },
-            {
-                "tags": [
-                "advertising=poster_box"
-                ],
-                "title": {
-                "ca": "un mupi",
-                "es": "un mupi",
-                "en": "a poster box"
-
-                }
-            },
-            {
-                "tags": [
-                "advertising=screen"
-                ],
-                "title": {
-                "ca": "una pantalla",
-                "es": "una pantalla",
-                "en": "a screen"
-                }
-            },
-            {
-                "tags": [
-                "advertising=sculpture"
-                ],
-                "title": {
-                "ca": "una escupltura",
-                "es": "una escultura",
-                "en": "an sculpture"
-                }
-            },
-            {
-                "tags": [
-                "advertising=sign"
-                ],
-                "title": {
-                "ca": "un lletrer",
-                "es": "un lletrer",
-                "en": "a sign"
-                }
-            },
-            {
-                "tags": [
-                "advertising=tarp"
-                ],
-                "title": {
-                "ca": "una lona",
-                "es": "una lona",
-                "en": "a tarp"
-                }
-            },
-            {
-                "tags": [
-                "advertising=totem"
-                ],
-                "title": {
-                "ca": "un tòtem",
-                "es": "un tótem",
-                "en": "a totem"
-                }
-            },
-            {
-                "tags": [
-                "advertising=wall_painting"
-                ],
-                "title": {
-                "ca": "una pintura a la paret",
-                "es": "una pitura en la pared",
-                "en": "a wall painted"
-                }
+            "then": {
+              "ca": "Tanca publicitària",
+              "es": "Valla publicitaria",
+              "en": "Billboard"
             }
-            ],
-            "wayHandling": 1
+          },
+          {
+            "if": {
+              "and": [
+                "advertising=board"
+              ]
+            },
+            "then": {
+              "ca": "Tauló d'anuncis",
+              "es": "Tablon de anuncios",
+              "en": "Board"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "advertising=poster_box"
+              ]
+            },
+            "then": {
+              "ca": "Mupi",
+              "es": "Mupi",
+              "en": "Poster Box"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "advertising=column"
+              ]
+            },
+            "then": {
+              "ca": "Columna",
+              "es": "Columna",
+              "en": "Column"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "advertising=flag"
+              ]
+            },
+            "then": {
+              "ca": "Bandera",
+              "es": "Bandera",
+              "en": "Flag"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "advertising=screen"
+              ]
+            },
+            "then": {
+              "ca": "Pantalla",
+              "es": "Pantalla",
+              "en": "Screen"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "advertising=sculpture"
+              ]
+            },
+            "then": {
+              "ca": "Esculptura",
+              "es": "Escultura",
+              "en": "Sculpture"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "advertising=sign"
+              ]
+            },
+            "then": {
+              "ca": "Cartell",
+              "es": "Cartel",
+              "en": "Sign"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "advertising=tarp"
+              ]
+            },
+            "then": {
+              "ca": "Lona",
+              "es": "Lona",
+              "en": "Tarp"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "advertising=totem"
+              ]
+            },
+            "then": {
+              "ca": "Tòtem",
+              "es": "Tótem",
+              "en": "Totem"
+            }
+          },
+          {
+            "if": {
+              "and": [
+                "advertising=wall_painting"
+              ]
+            },
+            "then": {
+              "ca": "Paret Pintada",
+              "es": "Pared Pintada",
+              "en": "Wall Painted"
+            }
+          }
+        ]
+      },
+      "description": {
+        "ca": "Completarem les dades dels elements publicitaris amb referència, operador i il·luminació",
+        "es": "Completaremos los datos de los elementos publicitarios con referencia, operador y iluminación",
+        "en": "We will complete data from advertising features with reference, operator and lit"
+      },
+      "tagRenderings": [
+        "images",
+        {
+          "id": "type",
+          "render": {
+            "ca": "Açò és un {advertising}",
+            "es": "Esto es un {advertising}",
+            "en": "This is a {advertising}"
+          },
+          "question": {
+            "ca": "Quin tipus d'element publicitari és aquest?",
+            "es": "¿Qué tipo de elemento publicitario es?",
+            "en": "Which type of advertising feature is this?"
+          },
+          "freeform": {
+            "key": "advertising"
+          },
+          "mappings": [
+            {
+              "if": {
+                "and": [
+                  "advertising=billboard"
+                ]
+              },
+              "then": {
+                "ca": "Açò és una tanca publicitària",
+                "es": "Esto es una valla publicitaria",
+                "en": "This is a billboard"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "advertising=board"
+                ]
+              },
+              "then": {
+                "ca": "Açò és un tauló d'anunis",
+                "es": "Esto es un tablón de anuncios",
+                "en": "This is a board"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "advertising=column"
+                ]
+              },
+              "then": {
+                "ca": "Açò és una columna",
+                "es": "Esto es una columna",
+                "en": "This is a column"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "advertising=flag"
+                ]
+              },
+              "then": {
+                "ca": "Açò és una bandera",
+                "es": "Esto es una bndera",
+                "en": "This is a flag"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "advertising=poster_box"
+                ]
+              },
+              "then": {
+                "ca": "Açò és un mupi",
+                "es": "Esto es un mupi",
+                "en": "This is a poster Box"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "advertising=screen"
+                ]
+              },
+              "then": {
+                "ca": "Açò és una pantalla",
+                "es": "Esto es una pantalla",
+                "en": "This is a screen"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "advertising=sculpture"
+                ]
+              },
+              "then": {
+                "ca": "Açò és una esculptura",
+                "es": "Esto es una escultura",
+                "en": "This is a sculpture"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "advertising=sign"
+                ]
+              },
+              "then": {
+                "ca": "Açò és un cartell",
+                "es": "Esto es un cartel",
+                "en": "This is a sign"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "advertising=tarp"
+                ]
+              },
+              "then": {
+                "ca": "Açò és una lona",
+                "es": "Esto es una lona",
+                "en": "This is a tarp"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "advertising=totem"
+                ]
+              },
+              "then": {
+                "ca": "Açò és un tòtem",
+                "es": "Esto es un tótem",
+                "en": "This is a totem"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "advertising=wall_painting"
+                ]
+              },
+              "then": {
+                "ca": "Açò és una paret pintada",
+                "es": "Esto es una pared pintada",
+                "en": "This is a wall painted"
+              }
+            }
+          ]
+        },
+        {
+          "id": "ref",
+          "render": {
+            "ca": "El número de referència és {ref}",
+            "es": "El número de referencia es {ref}",
+            "en": "Reference number is {ref}"
+          },
+          "question": {
+            "ca": "Quin és el número de refèrencia?",
+            "es": "¿Cual es el número de referencia?",
+            "en": "Wich is the reference number?"
+          },
+          "freeform": {
+            "key": "ref"
+          }
+        },
+        {
+          "id": "operator",
+          "render": {
+            "ca": "L'operador és {operator}",
+            "es": "El operador es {operator}",
+            "en": "Operated by {operator}"
+          },
+          "question": {
+            "ca": "Qui opera aquest element?",
+            "es": "¿Quien opera este elemento?",
+            "en": "Who operates this feature?"
+          },
+          "freeform": {
+            "addExtraTags": [],
+            "key": "operator"
+          }
+        },
+        {
+          "id": "lit",
+          "render": {
+            "ca": "Iluminat {lit}",
+            "es": "Iluminado {lit}",
+            "en": "Lit {lit}"
+          },
+          "question": {
+            "ca": "Aquest element està il·luminat?",
+            "es": "Este elemento está iluminado?",
+            "en": "This feature is lit?"
+          },
+          "freeform": {
+            "key": "lit"
+          },
+          "mappings": [
+            {
+              "if": {
+                "and": [
+                  "lit=yes"
+                ]
+              },
+              "then": {
+                "ca": "Aquest element està il·luminat",
+                "es": "Este elemento está iluminado",
+                "en": "This feature is lit"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "lit=no"
+                ]
+              },
+              "then": {
+                "ca": "Aqust element no està il·luminat",
+                "es": "Este elemento no está iluminado",
+                "en": "This feature is not lit"
+              }
+            }
+          ]
+        },
+        {
+          "id": "animated",
+          "render": {
+            "ca": " Animat amb {animated}",
+            "es": "Animado con {animated}",
+            "en": "Animated with {animated}"
+          },
+          "question": {
+            "ca": "Quin tipus d'animació té aquest element?",
+            "es": "Que tipo de animació tiene este elemento?",
+            "en": "Wich type of animation has this feature?"
+          },
+          "freeform": {
+            "key": "animated"
+          },
+          "mappings": [
+            {
+              "if": {
+                "and": [
+                  "animated=no"
+                ]
+              },
+              "then": {
+                "ca": "<b>Estàtic</b>, sense animació",
+                "es": "<b>Estático</b>, sin animación",
+                "en": "<b>Static</b>, without animation"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "animated=yes"
+                ]
+              },
+              "then": {
+                "ca": "Si, però sense especificar",
+                "es": "Si, pero sin especificar",
+                "en": "Yes, but without specifying"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "animated=screen"
+                ]
+              },
+              "then": {
+                "ca": "una <b>Pantalla</b>",
+                "es": "una <b>Pantalla</b>",
+                "en": "a <b>screen</b>"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "animated=digital_prices"
+                ]
+              },
+              "then": {
+                "ca": "<b>Preus digitals</b>",
+                "es": "<b>Precios digitales</b>",
+                "en": "<b>Digital Prices</b>"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "animated=digital_message"
+                ]
+              },
+              "then": {
+                "ca": "un <b>Missatge digital</b>",
+                "es": "un <b>Mensaje digital</b>",
+                "en": "a <b>Digital message</b>"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "animated=travision_blades"
+                ]
+              },
+              "then": {
+                "ca": "Trivision",
+                "es": "Trivision",
+                "en": "Trivision"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "animated=winding_posters"
+                ]
+              },
+              "then": {
+                "ca": "Cartells <b>Rotatius</b>",
+                "es": "Cartells <b>Rotatius</b>",
+                "en": "<b>Scrolling</b> posters"
+              }
+            },
+            {
+              "if": {
+                "and": [
+                  "animated=revolving"
+                ]
+              },
+              "then": {
+                "ca": "<b>Rota</b> sobre si mateix",
+                "es": "<b>Rota</b> sobre si mismo",
+                "en": "<b>Rotates</b> on itself"
+              }
+            }
+          ]
         }
-        ],
-        "roamingRenderings": []
-    }
\ No newline at end of file
+      ],
+      "mapRendering": [
+        {
+          "location": [
+            "point",
+            "centroid"
+          ],
+          "icon": {
+            "render": "./assets/themes/advertising/icon.svg",
+            "mappings": [
+              {
+                "if": {
+                  "or": [
+                    "advertising=billboard"
+                  ]
+                },
+                "then": "./assets/themes/advertising/Billboard.svg"
+              },
+              {
+                "if": "advertising=board",
+                "then": "./assets/themes/advertising/Board.svg"
+              },
+              {
+                "if": "advertising=column",
+                "then": "./assets/themes/advertising/Column.svg"
+              },
+              {
+                "if": "advertising=flag",
+                "then": "./assets/themes/advertising/icon.svg"
+              },
+              {
+                "if": "advertising=poster_box",
+                "then": "./assets/themes/advertising/Poster_box.svg"
+              },
+              {
+                "if": "advertising=screen",
+                "then": "./assets/themes/advertising/icon.svg"
+              },
+              {
+                "if": "advertising=sculpture",
+                "then": "./assets/themes/advertising/icon.svg"
+              },
+              {
+                "if": "advertising=sign",
+                "then": "./assets/themes/advertising/icon.svg"
+              },
+              {
+                "if": "advertising=tarp",
+                "then": "./assets/themes/advertising/icon.svg"
+              },
+              {
+                "if": "advertising=totem",
+                "then": "./assets/themes/advertising/Totem.svg"
+              },
+              {
+                "if": "advertising=wall_painting",
+                "then": "./assets/themes/advertising/icon.svg"
+              }
+            ]
+          },
+          "iconSize": "40,40,bottom"
+        },
+        {
+          "width": {
+            "render": "8"
+          },
+          "color": {
+            "render": "#00f"
+          }
+        }
+      ],
+      "presets": [
+        {
+          "tags": [
+            "advertising=billboard"
+          ],
+          "title": {
+            "en": "a billboard",
+            "ca": "una tanca publicitària",
+            "es": "una valla publicitària"
+          },
+          "description": {
+            "en": "A large outdoor advertising structure, typically found in high-traffic areas such as alongside busy roads",
+            "ca": "Les tanques publicitàries normalment són de gran tamany i estan situades prop de les carreteres",
+            "es": "Las vallas publicitarias normalment son de gran tamanó y están situadas cerca de las carreteras"
+          }
+        },
+        {
+          "tags": [
+            "advertising=board"
+          ],
+          "title": {
+            "ca": "un tauló d'anunis",
+            "es": "un tablón de anuncios",
+            "en": "a billboard"
+          },
+          "description": {
+            "en": "Small billboard for neighbourhood advertising, generally intended for pedestrians"
+          }
+        },
+        {
+          "tags": [
+            "advertising=column"
+          ],
+          "title": {
+            "ca": "una columna",
+            "es": "una columna",
+            "en": "a column"
+          },
+          "description": {
+            "en": "A cylindrical outdoor structure which shows advertisements"
+          }
+        },
+        {
+          "tags": [
+            "advertising=flag",
+            "man_made=pole"
+          ],
+          "title": {
+            "ca": "una bandera",
+            "es": "una bandera",
+            "en": "a flag"
+          }
+        },
+        {
+          "tags": [
+            "advertising=poster_box"
+          ],
+          "title": {
+            "ca": "un mupi",
+            "es": "un mupi",
+            "en": "a poster box"
+          }
+        },
+        {
+          "tags": [
+            "advertising=screen"
+          ],
+          "title": {
+            "ca": "una pantalla",
+            "es": "una pantalla",
+            "en": "a screen"
+          }
+        },
+        {
+          "tags": [
+            "advertising=sculpture"
+          ],
+          "title": {
+            "ca": "una escupltura",
+            "es": "una escultura",
+            "en": "an sculpture"
+          }
+        },
+        {
+          "tags": [
+            "advertising=sign"
+          ],
+          "title": {
+            "ca": "un lletrer",
+            "es": "un lletrer",
+            "en": "a sign"
+          }
+        },
+        {
+          "tags": [
+            "advertising=tarp"
+          ],
+          "title": {
+            "ca": "una lona",
+            "es": "una lona",
+            "en": "a tarp"
+          }
+        },
+        {
+          "tags": [
+            "advertising=totem"
+          ],
+          "title": {
+            "ca": "un tòtem",
+            "es": "un tótem",
+            "en": "a totem"
+          }
+        },
+        {
+          "tags": [
+            "advertising=wall_painting"
+          ],
+          "title": {
+            "ca": "una pintura a la paret",
+            "es": "una pitura en la pared",
+            "en": "a wall painted"
+          }
+        }
+      ]
+    }
+  ]
+}
diff --git a/assets/themes/advertising/icon.svg b/assets/themes/advertising/icon.svg
new file mode 100644
index 0000000000..c5864208b8
--- /dev/null
+++ b/assets/themes/advertising/icon.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="410.11697"
+   height="596.52539"
+   id="svg5457"
+   version="1.1"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   viewBox="0 0 410.11697 596.5254"
+   sodipodi:docname="Advertising_icon.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <defs
+     id="defs5459" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="0.50164535"
+     inkscape:cx="-217.28498"
+     inkscape:cy="349.84875"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1920"
+     inkscape:window-height="995"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:pagecheckerboard="0" />
+  <metadata
+     id="metadata5462">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(-4.9997578,2.4414063e-4)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#202020;stroke-width:80.1575;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 210.05823,596.52513 v -93.2064"
+       id="path6026"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:18.6413px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 98.210551,587.20449 H 321.90591"
+       id="path6005"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <rect
+       style="opacity:1;fill:#feffba;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:34.4491;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect6028"
+       width="375.66788"
+       height="468.87427"
+       x="22.224308"
+       y="17.224306" />
+    <path
+       style="opacity:1;fill:#ff0016;fill-opacity:1;fill-rule:nonzero;stroke:#ff3737;stroke-width:6.66672;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       inkscape:transform-center-x="-6.094721"
+       inkscape:transform-center-y="-15.944"
+       d="m 290.08798,352.09412 -56.75916,-38.02742 -35.60166,66.44131 -29.89903,-63.08235 -65.31296,14.03053 38.47635,-57.39815 -68.906779,-48.1612 76.130729,-8.20692 -29.80743,-85.29071 67.68283,39.99464 34.41325,-58.81027 20.18602,77.77268 64.1475,-21.87429 -36.14474,55.67947 79.62998,43.17439 -86.85427,10.71824 z"
+       id="path6030" />
+  </g>
+</svg>
diff --git a/assets/themes/advertising/license_info.json b/assets/themes/advertising/license_info.json
index 8561f09b89..8e0fd7f47a 100644
--- a/assets/themes/advertising/license_info.json
+++ b/assets/themes/advertising/license_info.json
@@ -1,16 +1,6 @@
 [
   {
-    "path": "Advertising_icon.svg",
-    "license": "CC BY-SA 4.0",
-    "authors": [
-      "PanierAvide"
-    ],
-    "sources": [
-      "https://commons.wikimedia.org/wiki/File:Advertising_icon.svg"
-    ]
-  },
-  {
-    "path": "Billboard_trunk.svg",
+    "path": "Billboard.svg",
     "license": "CC BY-SA 3.0",
     "authors": [
       "Barnes38"
@@ -39,6 +29,16 @@
       "https://wiki.openstreetmap.org/wiki/File:Column.svg"
     ]
   },
+  {
+    "path": "Newspaper_kiosk.svg",
+    "license": "CC BY-SA 3.0",
+    "authors": [
+      "Barnes38"
+    ],
+    "sources": [
+      "https://wiki.openstreetmap.org/wiki/File:Newspaper_kiosk_3.svg"
+    ]
+  },
   {
     "path": "Poster_box.svg",
     "license": "CC BY-SA 3.0",
@@ -58,5 +58,13 @@
     "sources": [
       "https://wiki.openstreetmap.org/wiki/File:Totem.svg"
     ]
+  },
+  {
+    "path": "icon.svg",
+    "license": "Unkown",
+    "authors": [
+      "Paunofu"
+    ],
+    "sources": []
   }
 ]
\ No newline at end of file
diff --git a/scripts/printVersion.ts b/scripts/printVersion.ts
deleted file mode 100644
index 10bdf47657..0000000000
--- a/scripts/printVersion.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import Constants from "../Models/Constants"
-
-console.log("git tag -a", Constants.vNumber, `-m "Deployed on ${new Date()}"`)