diff --git a/Customizations/AllKnownLayouts.ts b/Customizations/AllKnownLayouts.ts
index 77307bd722..1d92316f38 100644
--- a/Customizations/AllKnownLayouts.ts
+++ b/Customizations/AllKnownLayouts.ts
@@ -13,6 +13,8 @@ import {MetaMap} from "./Layouts/MetaMap";
 import {Natuurpunt} from "./Layouts/Natuurpunt";
 import {Bookcases} from "./Layouts/Bookcases";
 import {GhostBikes} from "./Layouts/GhostBikes";
+import * as bookcases from "../assets/themes/bookcases/Bookcases.json";
+import {CustomLayoutFromJSON} from "./JSON/CustomLayoutFromJSON";
 
 export class AllKnownLayouts {
 
@@ -24,22 +26,26 @@ export class AllKnownLayouts {
         new GRB(),
         new Cyclofix(),
         new GhostBikes(),
-        new Bookcases(),
+       // new Bookcases(),
+        CustomLayoutFromJSON.LayoutFromJSON(bookcases),
         new MetaMap(),
         new StreetWidth(),
         new ClimbingTrees(),
         new Artworks(),
         new Smoothness(),
         new Groen(),
+        
         /*
         new Toilets(),
         */
     ];
+    
 
     public static allSets: Map<string, Layout> = AllKnownLayouts.AllLayouts();
 
     private static AllLayouts(): Map<string, Layout> {
 
+
         const all = new All();
         this.allLayers = new Map<string, LayerDefinition>();
         for (const layout of this.layoutsList) {
diff --git a/Customizations/JSON/CustomLayoutFromJSON.ts b/Customizations/JSON/CustomLayoutFromJSON.ts
index 0eea134786..4b79baa7a3 100644
--- a/Customizations/JSON/CustomLayoutFromJSON.ts
+++ b/Customizations/JSON/CustomLayoutFromJSON.ts
@@ -127,7 +127,6 @@ export class CustomLayoutFromJSON {
         icon: "data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9Im5vIj8+CjxzdmcKICAgeG1sbnM6ZGM9Imh0dHA6Ly9wdXJsLm9yZy9kYy9lbGVtZW50cy8xLjEvIgogICB4bWxuczpjYz0iaHR0cDovL2NyZWF0aXZlY29tbW9ucy5vcmcvbnMjIgogICB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiCiAgIHhtbG5zOnN2Zz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciCiAgIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIKICAgaWQ9InN2ZzExMzgyIgogICBoZWlnaHQ9IjkwMCIKICAgd2lkdGg9IjkwMCIKICAgdmVyc2lvbj0iMS4wIj4KICA8bWV0YWRhdGEKICAgICBpZD0ibWV0YWRhdGExMCI+CiAgICA8cmRmOlJERj4KICAgICAgPGNjOldvcmsKICAgICAgICAgcmRmOmFib3V0PSIiPgogICAgICAgIDxkYzpmb3JtYXQ+aW1hZ2Uvc3ZnK3htbDwvZGM6Zm9ybWF0PgogICAgICAgIDxkYzp0eXBlCiAgICAgICAgICAgcmRmOnJlc291cmNlPSJodHRwOi8vcHVybC5vcmcvZGMvZGNtaXR5cGUvU3RpbGxJbWFnZSIgLz4KICAgICAgICA8ZGM6dGl0bGU+PC9kYzp0aXRsZT4KICAgICAgPC9jYzpXb3JrPgogICAgPC9yZGY6UkRGPgogIDwvbWV0YWRhdGE+CiAgPGRlZnMKICAgICBpZD0iZGVmczExMzg0IiAvPgogIDxnCiAgICAgaWQ9ImxheWVyMSIKICAgICB0cmFuc2Zvcm09Im1hdHJpeCgwLjkwMTAzMjU4LDAsMCwwLjkwMTAzMjU4LDExMi44NDA1OCwtMS45MDYwMTc3KSI+CiAgICA8ZwogICAgICAgaWQ9ImcxMTQ3NiI+CiAgICAgIDxwYXRoCiAgICAgICAgIGlkPSJwYXRoMTE0NzIiCiAgICAgICAgIHN0eWxlPSJmb250LXN0eWxlOm5vcm1hbDtmb250LXdlaWdodDpub3JtYWw7Zm9udC1zaXplOjEyMDEuOTI0OTI2NzZweDtmb250LWZhbWlseTonQml0c3RyZWFtIFZlcmEgU2Fucyc7dGV4dC1hbGlnbjpjZW50ZXI7dGV4dC1hbmNob3I6bWlkZGxlO2ZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MXB4O3N0cm9rZS1saW5lY2FwOmJ1dHQ7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO3N0cm9rZS1vcGFjaXR5OjEiCiAgICAgICAgIGQ9Ik0gNDc0LjUwODg4LDcxOC4yMjg0MSBIIDMwMy40OTU0NyB2IC0yMi4zMDEzNCBjIC0yLjRlLTQsLTM3Ljk1MTA4IDQuMzAzNTIsLTY4Ljc2MjExIDEyLjkxMTMsLTkyLjQzMzE5IDguNjA3MjgsLTIzLjY3MDMyIDIzLjYzMzUyLC00NS4yODY5NSA0MC42NTMyNCwtNjQuODQ5OTYgMTcuMDE5MTQsLTE5LjU2MjExIDQxLjk4NzM0LC0yNi4zMzI2NCAxMDEuNDU3OTMsLTc1LjYzMDg1IDMxLjY5MDk1LC0yNS44MjIwMyA1NS4yODEzLC03Ny4xNTIzIDU1LjI4MTc1LC05OC42NzE3NCAyLjIxMjMyLC01Ni45MjI0NSAtMTMuOTM5ODMsLTc5LjM0MjIgLTM0LjU2Mjg3LC05OS45NjUyNCAtMjIuNjczNTUsLTE5LjY3NzE3IC02MC42NzAyNywtMzAuMDY5OTggLTkwLjk5ODkyLC0zMC4wNjk5OCAtMjcuNzc5MjEsNi45ZS00IC02OC40NjczNSw4LjA4ODcxIC04Ny43NjY2LDI1LjM3MDQ3IC0yNS45MzgxNywxNy4yODMwOCAtNjUuMjM3NDcsNzMuNzA2MTEgLTU3LjA0Njg3LDEzMC41NDU3NyBsIC0xOTQuNTE2OTQzLDEuNzAyMjIgYyAwLC0xNTcuMjEzOTkgMjkuMzkzNjk5LC0xOTguNjk0NjUgOTkuMDA0MTEzLC0yNjMuMDMwMzIgNjcuMzk3MzksLTU0LjM3NjY0MyAxMjYuNTMxMjgsLTczLjI2ODM2NSAyNDMuODQ3NTcsLTczLjI2ODM2NSA4OS43MTc5MSwwIDE2MS44OTcyOCwxNy44MDI4MSAyMTQuMzI1NTIsNTMuNDA1ODU1IDcxLjIwNzE0LDQ4LjEyNDcyIDEyMi4zMDEwNSwxMTEuMTgzNTQgMTIyLjMwMTA1LDIzMC4xMTI4MSAtNi45ZS00LDQ0LjMyMDgxIC0xOS4xNTI1Myw5MC43ODYzOCAtNDMuMDcyNiwxMjguMzMyOTkgLTE4LjM4OTQ3LDMwLjkwOTM4IC02MC4zNzUxMSw2Ni40NTIzNiAtMTE4LjIxMjM3LDEwNC40MTYyOCAtNDIuODM2MDcsMjUuNzY4NiAtNjYuNjcxOTYsNTMuMTE5MjYgLTc3LjAzOTY0LDcyLjA5NDYgLTEwLjM2ODYzLDE4Ljk3NjAzIC0xNS41NTI3MSw0My43MjI2NyAtMTUuNTUyMjUsNzQuMjM5OTkgeiIgLz4KICAgICAgPHBhdGgKICAgICAgICAgaWQ9InBhdGgxMTQ3NCIKICAgICAgICAgc3R5bGU9ImZpbGw6IzAwMDAwMDtmaWxsLW9wYWNpdHk6MTtzdHJva2U6bm9uZTtzdHJva2Utd2lkdGg6MztzdHJva2UtbGluZWNhcDpzcXVhcmU7c3Ryb2tlLWxpbmVqb2luOm1pdGVyO3N0cm9rZS1taXRlcmxpbWl0OjQ7c3Ryb2tlLWRhc2hhcnJheTpub25lO3N0cm9rZS1kYXNob2Zmc2V0OjA7c3Ryb2tlLW9wYWNpdHk6MSIKICAgICAgICAgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMS4xMDYzODMsLTUuNTMxOTE0OSkiCiAgICAgICAgIGQ9Im0gNDgyLjM4Mjk4LDg2OS44MDkwMiBhIDk0LjA0MjU1Nyw3My4wMjEyNzggMCAxIDEgLTE4OC4wODUxMSwwIDk0LjA0MjU1Nyw3My4wMjEyNzggMCAxIDEgMTg4LjA4NTExLDAgeiIgLz4KICAgIDwvZz4KICA8L2c+Cjwvc3ZnPgo="
     }
 
-
     public static FromQueryParam(layoutFromBase64: string): Layout {
         if(layoutFromBase64 === "test"){
             console.log(btoa(JSON.stringify(CustomLayoutFromJSON.exampleLayout)));
@@ -259,7 +258,7 @@ export class CustomLayoutFromJSON {
         return new Translation(json);
     }
 
-    private static LayoutFromJSON(json: any) {
+    public static LayoutFromJSON(json: any) {
         const t = CustomLayoutFromJSON.MaybeTranslation;
         const layout = new Layout(json.name,
             [json.language],
@@ -274,9 +273,4 @@ export class CustomLayoutFromJSON {
         return layout;
     }
 
-
-    public static TagRenderingOptionsFromJson(spec: any): TagRenderingOptions {
-        return new TagRenderingOptions(spec);
-    }
-
 }
\ No newline at end of file
diff --git a/Customizations/Layers/Widths.ts b/Customizations/Layers/Widths.ts
index 8447b9ba27..3a196f6957 100644
--- a/Customizations/Layers/Widths.ts
+++ b/Customizations/Layers/Widths.ts
@@ -1,6 +1,5 @@
 import {LayerDefinition} from "../LayerDefinition";
 import {And, Not, Or, Tag} from "../../Logic/TagsFilter";
-import {UIEventSource} from "../../UI/UIEventSource";
 import {Park} from "./Park";
 import {TagRenderingOptions} from "../TagRenderingOptions";
 
diff --git a/Customizations/Layouts/StreetWidth.ts b/Customizations/Layouts/StreetWidth.ts
index bf64236c75..9ae9573e1e 100644
--- a/Customizations/Layouts/StreetWidth.ts
+++ b/Customizations/Layouts/StreetWidth.ts
@@ -1,7 +1,6 @@
 import {Layout} from "../Layout";
 import * as Layer from "../Layers/Bookcases";
 import {Widths} from "../Layers/Widths";
-import {UIEventSource} from "../../UI/UIEventSource";
 
 export class StreetWidth extends Layout{
     
diff --git a/Customizations/OnlyShowIf.ts b/Customizations/OnlyShowIf.ts
index 53811e510f..99783ec744 100644
--- a/Customizations/OnlyShowIf.ts
+++ b/Customizations/OnlyShowIf.ts
@@ -4,7 +4,7 @@
 import {TagDependantUIElement, TagDependantUIElementConstructor} from "./UIElementConstructor";
 import {TagsFilter, TagUtils} from "../Logic/TagsFilter";
 import {UIElement} from "../UI/UIElement";
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "../Logic/UIEventSource";
 import {Changes} from "../Logic/Osm/Changes";
 
 
diff --git a/Customizations/Questions/AccessTag.ts b/Customizations/Questions/AccessTag.ts
index 7ed7ed05ac..866b36f499 100644
--- a/Customizations/Questions/AccessTag.ts
+++ b/Customizations/Questions/AccessTag.ts
@@ -1,4 +1,3 @@
-import {UIEventSource} from "../../UI/UIEventSource";
 import {Changes} from "../../Logic/Osm/Changes";
 import {And, Tag} from "../../Logic/TagsFilter";
 import {TagRenderingOptions} from "../TagRenderingOptions";
diff --git a/Customizations/Questions/OperatorTag.ts b/Customizations/Questions/OperatorTag.ts
index 2d293f7e94..e26440bb35 100644
--- a/Customizations/Questions/OperatorTag.ts
+++ b/Customizations/Questions/OperatorTag.ts
@@ -1,4 +1,3 @@
-import {UIEventSource} from "../../UI/UIEventSource";
 import {Changes} from "../../Logic/Osm/Changes";
 import {Tag} from "../../Logic/TagsFilter";
 import {TagRenderingOptions} from "../TagRenderingOptions";
diff --git a/Customizations/TagRendering.ts b/Customizations/TagRendering.ts
index 5b6eb17bde..6dc136a08d 100644
--- a/Customizations/TagRendering.ts
+++ b/Customizations/TagRendering.ts
@@ -1,5 +1,5 @@
 import {UIElement} from "../UI/UIElement";
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "../Logic/UIEventSource";
 import {And, Tag, TagsFilter, TagUtils} from "../Logic/TagsFilter";
 import {FixedUiElement} from "../UI/Base/FixedUiElement";
 import {SaveButton} from "../UI/SaveButton";
diff --git a/Customizations/TagRenderingOptions.ts b/Customizations/TagRenderingOptions.ts
index 7aeb723880..148e20faa4 100644
--- a/Customizations/TagRenderingOptions.ts
+++ b/Customizations/TagRenderingOptions.ts
@@ -4,7 +4,7 @@ import {parsePhoneNumberFromString} from "libphonenumber-js";
 import {UIElement} from "../UI/UIElement";
 import {TagsFilter, TagUtils} from "../Logic/TagsFilter";
 import {OnlyShowIfConstructor} from "./OnlyShowIf";
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 export class TagRenderingOptions implements TagDependantUIElementConstructor {
 
diff --git a/Customizations/UIElementConstructor.ts b/Customizations/UIElementConstructor.ts
index 0920c129fc..f5380cf32b 100644
--- a/Customizations/UIElementConstructor.ts
+++ b/Customizations/UIElementConstructor.ts
@@ -1,5 +1,5 @@
-import {UIEventSource} from "../UI/UIEventSource";
 import {UIElement} from "../UI/UIElement";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 
 export interface Dependencies {
diff --git a/Customizations/tsconfig.json b/Customizations/tsconfig.json
new file mode 100644
index 0000000000..66d3288953
--- /dev/null
+++ b/Customizations/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "target": "es5",
+    "sourceMap": true,
+    "resolveJsonModule": true,
+  },
+  "exclude": [
+    "node_modules"
+  ]
+}
\ No newline at end of file
diff --git a/InitUiElements.ts b/InitUiElements.ts
index d782131125..a8e0976c17 100644
--- a/InitUiElements.ts
+++ b/InitUiElements.ts
@@ -6,7 +6,6 @@ import {ShareScreen} from "./UI/ShareScreen";
 import {FixedUiElement} from "./UI/Base/FixedUiElement";
 import {CheckBox} from "./UI/Input/CheckBox";
 import Combine from "./UI/Base/Combine";
-import {UIEventSource} from "./UI/UIEventSource";
 import {UIElement} from "./UI/UIElement";
 import {MoreScreen} from "./UI/MoreScreen";
 import {Tag} from "./Logic/TagsFilter";
@@ -26,7 +25,8 @@ import {CustomLayout} from "./Logic/CustomLayers";
 import {Preset} from "./Customizations/LayerDefinition";
 import {VariableUiElement} from "./UI/Base/VariableUIElement";
 import {LayerUpdater} from "./Logic/LayerUpdater";
-import {QueryParameters} from "./Logic/QueryParameters";
+import {UIEventSource} from "./Logic/UIEventSource";
+import {QueryParameters} from "./Logic/Web/QueryParameters";
 
 export class InitUiElements {
 
diff --git a/Logic/CustomLayersPanel.ts b/Logic/CustomLayersPanel.ts
index 087b95e143..e36cc58bdc 100644
--- a/Logic/CustomLayersPanel.ts
+++ b/Logic/CustomLayersPanel.ts
@@ -1,7 +1,7 @@
 import {UIElement} from "../UI/UIElement";
 import {State} from "../State";
 import Translations from "../UI/i18n/Translations";
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "./UIEventSource";
 import {AllKnownLayouts} from "../Customizations/AllKnownLayouts";
 import Combine from "../UI/Base/Combine";
 import {Img} from "../UI/Img";
diff --git a/Logic/ElementStorage.ts b/Logic/ElementStorage.ts
index 368179a949..a8e52f1a3e 100644
--- a/Logic/ElementStorage.ts
+++ b/Logic/ElementStorage.ts
@@ -1,7 +1,7 @@
 /**
  * Keeps track of a dictionary 'elementID' -> element
  */
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "./UIEventSource";
 
 export class ElementStorage {
 
diff --git a/Logic/FilteredLayer.ts b/Logic/FilteredLayer.ts
index c1406553cc..dffbfef77c 100644
--- a/Logic/FilteredLayer.ts
+++ b/Logic/FilteredLayer.ts
@@ -1,5 +1,5 @@
 import {TagsFilter, TagUtils} from "./TagsFilter";
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "./UIEventSource";
 import L from "leaflet"
 import {GeoOperations} from "./GeoOperations";
 import {UIElement} from "../UI/UIElement";
diff --git a/Logic/ImageSearcher.ts b/Logic/ImageSearcher.ts
index b53a73d826..cd6be2ea0c 100644
--- a/Logic/ImageSearcher.ts
+++ b/Logic/ImageSearcher.ts
@@ -1,11 +1,11 @@
-import {UIEventSource} from "../UI/UIEventSource";
-import {ImagesInCategory, Wikidata, Wikimedia} from "./Wikimedia";
 import {WikimediaImage} from "../UI/Image/WikimediaImage";
 import {SimpleImageElement} from "../UI/Image/SimpleImageElement";
 import {UIElement} from "../UI/UIElement";
 import {Changes} from "./Osm/Changes";
 import {ImgurImage} from "../UI/Image/ImgurImage";
 import {State} from "../State";
+import {ImagesInCategory, Wikidata, Wikimedia} from "./Web/Wikimedia";
+import {UIEventSource} from "./UIEventSource";
 
 /**
  * There are multiple way to fetch images for an object
diff --git a/Logic/LayerUpdater.ts b/Logic/LayerUpdater.ts
index dcb510f31f..ee2171290a 100644
--- a/Logic/LayerUpdater.ts
+++ b/Logic/LayerUpdater.ts
@@ -1,5 +1,5 @@
 import {Or, TagsFilter} from "./TagsFilter";
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "./UIEventSource";
 import {FilteredLayer} from "./FilteredLayer";
 import {Bounds} from "./Bounds";
 import {Overpass} from "./Osm/Overpass";
diff --git a/Logic/Leaflet/Basemap.ts b/Logic/Leaflet/Basemap.ts
index a4ce2bd262..94e70020e1 100644
--- a/Logic/Leaflet/Basemap.ts
+++ b/Logic/Leaflet/Basemap.ts
@@ -1,5 +1,5 @@
 import L from "leaflet"
-import {UIEventSource} from "../../UI/UIEventSource";
+import {UIEventSource} from "../UIEventSource";
 import {UIElement} from "../../UI/UIElement";
 
 
diff --git a/Logic/Leaflet/GeoLocationHandler.ts b/Logic/Leaflet/GeoLocationHandler.ts
index 4138326561..745b3a5142 100644
--- a/Logic/Leaflet/GeoLocationHandler.ts
+++ b/Logic/Leaflet/GeoLocationHandler.ts
@@ -1,5 +1,5 @@
 import L from "leaflet";
-import {UIEventSource} from "../../UI/UIEventSource";
+import {UIEventSource} from "../UIEventSource";
 import {UIElement} from "../../UI/UIElement";
 import {State} from "../../State";
 import {Utils} from "../../Utils";
diff --git a/Logic/Leaflet/StrayClickHandler.ts b/Logic/Leaflet/StrayClickHandler.ts
index fefc1817d5..576c08a070 100644
--- a/Logic/Leaflet/StrayClickHandler.ts
+++ b/Logic/Leaflet/StrayClickHandler.ts
@@ -1,6 +1,6 @@
 import {Basemap} from "./Basemap";
 import L from "leaflet";
-import {UIEventSource} from "../../UI/UIEventSource";
+import {UIEventSource} from "../UIEventSource";
 import {UIElement} from "../../UI/UIElement";
 import {State} from "../../State";
 
diff --git a/Logic/Osm/Changes.ts b/Logic/Osm/Changes.ts
index c967e20a66..75bf40b4d5 100644
--- a/Logic/Osm/Changes.ts
+++ b/Logic/Osm/Changes.ts
@@ -2,7 +2,7 @@
  * Handles all changes made to OSM.
  * Needs an authenticator via OsmConnection
  */
-import {UIEventSource} from "../../UI/UIEventSource";
+import {UIEventSource} from "../UIEventSource";
 import {OsmConnection} from "./OsmConnection";
 import {OsmNode, OsmObject} from "./OsmObject";
 import {And, Tag, TagsFilter} from "../TagsFilter";
diff --git a/Logic/Osm/OsmConnection.ts b/Logic/Osm/OsmConnection.ts
index f8a922e867..db9a504c01 100644
--- a/Logic/Osm/OsmConnection.ts
+++ b/Logic/Osm/OsmConnection.ts
@@ -1,6 +1,6 @@
 // @ts-ignore
 import osmAuth from "osm-auth";
-import {UIEventSource} from "../../UI/UIEventSource";
+import {UIEventSource} from "../UIEventSource";
 import {CustomLayersState} from "../CustomLayersState";
 
 export class UserDetails {
diff --git a/Logic/Osm/OsmImageUploadHandler.ts b/Logic/Osm/OsmImageUploadHandler.ts
index 935a97c28f..b3262d5b05 100644
--- a/Logic/Osm/OsmImageUploadHandler.ts
+++ b/Logic/Osm/OsmImageUploadHandler.ts
@@ -2,7 +2,7 @@
  * Helps in uplaoding, by generating the rigth title, decription and by adding the tag to the changeset
  */
 import {Changes} from "./Changes";
-import {UIEventSource} from "../../UI/UIEventSource";
+import {UIEventSource} from "../UIEventSource";
 import {ImageUploadFlow} from "../../UI/ImageUploadFlow";
 import {UserDetails} from "./OsmConnection";
 import {SlideShow} from "../../UI/SlideShow";
diff --git a/UI/UIEventSource.ts b/Logic/UIEventSource.ts
similarity index 100%
rename from UI/UIEventSource.ts
rename to Logic/UIEventSource.ts
diff --git a/Logic/Imgur.ts b/Logic/Web/Imgur.ts
similarity index 100%
rename from Logic/Imgur.ts
rename to Logic/Web/Imgur.ts
diff --git a/Logic/LocalStorageSource.ts b/Logic/Web/LocalStorageSource.ts
similarity index 90%
rename from Logic/LocalStorageSource.ts
rename to Logic/Web/LocalStorageSource.ts
index f1b5896607..ee604c89b3 100644
--- a/Logic/LocalStorageSource.ts
+++ b/Logic/Web/LocalStorageSource.ts
@@ -1,4 +1,4 @@
-import {UIEventSource} from "../UI/UIEventSource";
+import {UIEventSource} from "../UIEventSource";
 
 export class LocalStorageSource {
 
diff --git a/Logic/QueryParameters.ts b/Logic/Web/QueryParameters.ts
similarity index 96%
rename from Logic/QueryParameters.ts
rename to Logic/Web/QueryParameters.ts
index b769258cd9..279b1c8c61 100644
--- a/Logic/QueryParameters.ts
+++ b/Logic/Web/QueryParameters.ts
@@ -1,8 +1,7 @@
 /**
  * Wraps the query parameters into UIEventSources
  */
-import {UIEventSource} from "../UI/UIEventSource";
-import {UIElement} from "../UI/UIElement";
+import {UIEventSource} from "../UIEventSource";
 
 export class QueryParameters {
 
diff --git a/Logic/Wikimedia.ts b/Logic/Web/Wikimedia.ts
similarity index 100%
rename from Logic/Wikimedia.ts
rename to Logic/Web/Wikimedia.ts
diff --git a/README.md b/README.md
index 6193a6ad95..e6c065d6c3 100644
--- a/README.md
+++ b/README.md
@@ -3,17 +3,19 @@
 > Let a thousand flowers bloom
 
 
-MapComplete attempts to be a webversion of StreetComplete. However, we focus on 'themes', a bit similar as mapcontrib.
+MapComplete attempts to be a webversion crossover of StreetComplete and MapContrib. It tries to be just as easy to use as StreetComplete, but it allows to focus on one single theme per instance (e.g. nature, bicycle infrastructure, ...)
 
 The design goals of MapComplete are to be:
 
-- Easy to use
-- Easy to deploy
+- Easy to use, both on web and on mobile
+- Easy to deploy (by not having a backand)
 - Easy to modify
 
-The basic functionality is to download some map features with overpass and then ask certain questions. An answer is sent back to OpenStreetMap.
+The basic functionality is to download some map features from Overpass and then ask certain questions. An answer is sent back to directly to OpenStreetMap.
 
-Furthermore, it shows images present in the `image` tag or, if a `wikidata` or `wikimedia_commons`-tag is present, it follows those to get these images too
+Furthermore, it shows images present in the `image` tag or, if a `wikidata` or `wikimedia_commons`-tag is present, it follows those to get these images too.
+
+An explicit non-goal of MapComplete is to modify geometries of ways. Although adding a point to a way or splitting a way in two parts might be added one day.
 
 ## Examples
 
diff --git a/State.ts b/State.ts
index 734873d0ec..4cd5c82902 100644
--- a/State.ts
+++ b/State.ts
@@ -1,7 +1,4 @@
-import {UIEventSource} from "./UI/UIEventSource";
 import {UIElement} from "./UI/UIElement";
-import {QueryParameters} from "./Logic/QueryParameters";
-import {LocalStorageSource} from "./Logic/LocalStorageSource";
 import {Layout} from "./Customizations/Layout";
 import {Utils} from "./Utils";
 import {LayerDefinition, Preset} from "./Customizations/LayerDefinition";
@@ -14,6 +11,9 @@ import Translations from "./UI/i18n/Translations";
 import {CustomLayersState} from "./Logic/CustomLayersState";
 import {FilteredLayer} from "./Logic/FilteredLayer";
 import {LayerUpdater} from "./Logic/LayerUpdater";
+import {UIEventSource} from "./Logic/UIEventSource";
+import {LocalStorageSource} from "./Logic/Web/LocalStorageSource";
+import {QueryParameters} from "./Logic/Web/QueryParameters";
 
 /**
  * Contains the global state: a bunch of UI-event sources
diff --git a/UI/Base/SubtleButton.ts b/UI/Base/SubtleButton.ts
index 0234d6acbb..b13f1b81ad 100644
--- a/UI/Base/SubtleButton.ts
+++ b/UI/Base/SubtleButton.ts
@@ -1,7 +1,6 @@
 import {UIElement} from "../UIElement";
 import Translations from "../i18n/Translations";
 import Combine from "./Combine";
-import {link} from "fs";
 
 
 export class SubtleButton extends UIElement{
diff --git a/UI/Base/TabbedComponent.ts b/UI/Base/TabbedComponent.ts
index b7a0f96a94..b79f28e12b 100644
--- a/UI/Base/TabbedComponent.ts
+++ b/UI/Base/TabbedComponent.ts
@@ -1,7 +1,6 @@
 import {UIElement} from "../UIElement";
-import {UIEventSource} from "../UIEventSource";
 import Translations from "../i18n/Translations";
-
+import {UIEventSource} from "../../Logic/UIEventSource";
 
 export class TabbedComponent extends UIElement {
 
diff --git a/UI/Base/VariableUIElement.ts b/UI/Base/VariableUIElement.ts
index 8afab13b27..3b24749835 100644
--- a/UI/Base/VariableUIElement.ts
+++ b/UI/Base/VariableUIElement.ts
@@ -1,5 +1,5 @@
 import {UIElement} from "../UIElement";
-import {UIEventSource} from "../UIEventSource";
+import {UIEventSource} from "../../Logic/UIEventSource";
 
 export class VariableUiElement extends UIElement {
     private _html: UIEventSource<string>;
diff --git a/UI/CenterMessageBox.ts b/UI/CenterMessageBox.ts
index 9656f437ce..7f44aa56d5 100644
--- a/UI/CenterMessageBox.ts
+++ b/UI/CenterMessageBox.ts
@@ -1,8 +1,8 @@
 import {UIElement} from "./UIElement";
-import {UIEventSource} from "./UIEventSource";
 import {OsmConnection} from "../Logic/Osm/OsmConnection";
 import Translations from "./i18n/Translations";
 import {State} from "../State";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 export class CenterMessageBox extends UIElement {
 
@@ -46,7 +46,6 @@ export class CenterMessageBox extends UIElement {
         if (State.state.centerMessage.data != "") {
             pstyle.opacity = "1";
             pstyle.pointerEvents = "all";
-            State.state.osmConnection.registerActivateOsmAUthenticationClass();
             return;
         }
         pstyle.pointerEvents = "none";
diff --git a/UI/ConfirmDialog.ts b/UI/ConfirmDialog.ts
index a4159f424e..79a2b331b9 100644
--- a/UI/ConfirmDialog.ts
+++ b/UI/ConfirmDialog.ts
@@ -1,7 +1,7 @@
 import {UIElement} from "./UIElement";
-import {UIEventSource} from "./UIEventSource";
 import {FixedUiElement} from "./Base/FixedUiElement";
 import {VariableUiElement} from "./Base/VariableUIElement";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 
 export class ConfirmDialog extends UIElement {
diff --git a/UI/CustomThemeGenerator/Preview.ts b/UI/CustomThemeGenerator/Preview.ts
new file mode 100644
index 0000000000..9b69cc0eb9
--- /dev/null
+++ b/UI/CustomThemeGenerator/Preview.ts
@@ -0,0 +1,34 @@
+import {LayoutConfigJson} from "../../Customizations/JSON/CustomLayoutFromJSON";
+import {UIEventSource} from "../../Logic/UIEventSource";
+import {UIElement} from "../UIElement";
+import Combine from "../Base/Combine";
+
+export class Preview extends UIElement {
+    private url: UIEventSource<string>;
+    private config: UIEventSource<LayoutConfigJson>;
+
+    constructor(url: UIEventSource<string>, config: UIEventSource<LayoutConfigJson>) {
+        super(url);
+        this.config = config;
+        this.url = url;
+    }
+
+    InnerRender(): string {
+        const url = this.url.data;
+        return new Combine([
+            `<iframe width="99%" height="70%" src="${this.url.data}"></iframe>`,
+            '<p class="alert">The above preview is in testmode. Changes will not be sent to OSM, so feel free to add points and answer questions</p> ',
+            `<h2>Your link</h2>`,
+            '<span class="alert">Bookmark the link below</span><br/>',
+            'MapComplete has no backend. The <i>entire</i> theme configuration is saved in the following URL. This means that this URL is needed to revive and change your MapComplete instance.<br/>',
+            `<a target='_blank' href='${this.url.data}'>${this.url.data}</a><br/>`,
+            '<h2>JSON-configuration</h2>',
+            'You can see the configuration in JSON format below.<br/>',
+            '<span class=\'literal-code iframe-code-block\' style="width:95%">',
+            JSON.stringify(this.config.data, null, 2).replace(/\n/g, "<br/>").replace(/ /g, "&nbsp;"),
+            '</span>'
+
+        ]).Render();
+    }
+
+}
\ No newline at end of file
diff --git a/themeGenerator.ts b/UI/CustomThemeGenerator/ThemeGenerator.ts
similarity index 59%
rename from themeGenerator.ts
rename to UI/CustomThemeGenerator/ThemeGenerator.ts
index 0152ce44bc..de8ab72629 100644
--- a/themeGenerator.ts
+++ b/UI/CustomThemeGenerator/ThemeGenerator.ts
@@ -1,16 +1,19 @@
-import {UIElement} from "./UI/UIElement";
-import {OsmConnection, UserDetails} from "./Logic/Osm/OsmConnection";
-import {UIEventSource} from "./UI/UIEventSource";
-import Combine from "./UI/Base/Combine";
-import {TextField} from "./UI/Input/TextField";
-import {VariableUiElement} from "./UI/Base/VariableUIElement";
-import {VerticalCombine} from "./UI/Base/VerticalCombine";
-import {FixedUiElement} from "./UI/Base/FixedUiElement";
-import {TabbedComponent} from "./UI/Base/TabbedComponent";
-import {LayerConfigJson, LayoutConfigJson, TagRenderingConfigJson} from "./Customizations/JSON/CustomLayoutFromJSON";
-import {Button} from "./UI/Base/Button";
-import {type} from "os";
-import {Tag} from "./Logic/TagsFilter";
+import {UIElement} from "../UIElement";
+import {VerticalCombine} from "../Base/VerticalCombine";
+import {VariableUiElement} from "../Base/VariableUIElement";
+import Combine from "../Base/Combine";
+import {
+    LayerConfigJson,
+    LayoutConfigJson,
+    TagRenderingConfigJson
+} from "../../Customizations/JSON/CustomLayoutFromJSON";
+import {TabbedComponent} from "../Base/TabbedComponent";
+import {UIEventSource} from "../../Logic/UIEventSource";
+import {OsmConnection, UserDetails} from "../../Logic/Osm/OsmConnection";
+import {Button} from "../Base/Button";
+import {FixedUiElement} from "../Base/FixedUiElement";
+import {TextField} from "../Input/TextField";
+
 
 function TagsToString(tags: string | string [] | { k: string, v: string }[]) {
     if (tags === undefined) {
@@ -31,27 +34,9 @@ function TagsToString(tags: string | string [] | { k: string, v: string }[]) {
     return newTags.join(",");
 }
 
-export class Preview extends UIElement {
-    private url: UIEventSource<string>;
-    private config: UIEventSource<LayoutConfigJson>;
 
-    constructor(url: UIEventSource<string>, config: UIEventSource<LayoutConfigJson>) {
-        super(url);
-        this.config = config;
-        this.url = url;
-    }
+let createFieldUI: (label: string, key: string, root: any, options?: { deflt?: string }) => UIElement;
 
-    InnerRender(): string {
-        const url = this.url.data;
-        return new Combine([
-            `<iframe width="100%" height="50%" src="${this.url.data}"></iframe>`,
-            `<br/><br><h2>Save this link below:</h2><a target='_blank' href='${this.url.data}'>${this.url.data}</a>`,
-            JSON.stringify(this.config.data, null, 2).replace(/\n/g, "<br/>").replace(/ /g, "&nbsp;"),
-
-        ]).Render();
-    }
-
-}
 
 class MappingGenerator extends UIElement {
 
@@ -60,21 +45,19 @@ class MappingGenerator extends UIElement {
     constructor(fullConfig: UIEventSource<LayoutConfigJson>,
                 layerConfig: LayerConfigJson,
                 tagRendering: TagRenderingConfigJson,
-                mapping: { if: string | string[] | { k: string, v: string }[] },
-                generateField: (src: UIEventSource<any>, label: string, key: string, root: any, deflt?: string) => UIElement) {
+                mapping: { if: string | string[] | { k: string, v: string }[] }) {
         super(undefined);
-        this.CreateElements(fullConfig, layerConfig, tagRendering, mapping, generateField)
+        this.CreateElements(fullConfig, layerConfig, tagRendering, mapping)
     }
 
     private CreateElements(fullConfig: UIEventSource<LayoutConfigJson>, layerConfig: LayerConfigJson,
                            tagRendering: TagRenderingConfigJson,
-                           mapping,
-                           generateField: (src: UIEventSource<any>, label: string, key: string, root: any, deflt?: string) => UIElement) {
+                           mapping) {
         {
             const self = this;
             this.elements = [
-                generateField(fullConfig, "If these tags apply", "if", mapping),
-                generateField(fullConfig, "Then: show this text", "then", mapping),
+                createFieldUI("If these tags apply", "if", mapping),
+                createFieldUI("Then: show this text", "then", mapping),
                 new Button("Remove this mapping", () => {
                     for (let i = 0; i < tagRendering.mappings.length; i++) {
                         if (tagRendering.mappings[i] === mapping) {
@@ -106,34 +89,32 @@ class TagRenderingGenerator
     constructor(fullConfig: UIEventSource<LayoutConfigJson>,
                 layerConfig: LayerConfigJson,
                 tagRendering: TagRenderingConfigJson,
-                generateField: (src: UIEventSource<any>, label: string, key: string, root: any, deflt?: string) => UIElement,
                 isTitle: boolean = false) {
         super(undefined);
-        this.CreateElements(fullConfig, layerConfig, tagRendering, generateField, isTitle)
+        this.CreateElements(fullConfig, layerConfig, tagRendering, isTitle)
     }
 
-    private CreateElements(fullConfig: UIEventSource<LayoutConfigJson>, layerConfig: LayerConfigJson, tagRendering: TagRenderingConfigJson, generateField: (src: UIEventSource<any>, label: string, key: string, root: any, deflt?: string) => UIElement, isTitle: boolean) {
+    private CreateElements(fullConfig: UIEventSource<LayoutConfigJson>, layerConfig: LayerConfigJson, tagRendering: TagRenderingConfigJson, isTitle: boolean) {
 
 
         const self = this;
         this.elements = [
             new FixedUiElement(isTitle ? "<h3>Popup title</h3>" : "<h3>TagRendering/TagQuestion</h3>"),
-            generateField(fullConfig, "Key", "key", tagRendering),
-            generateField(fullConfig, "Rendering", "render", tagRendering),
-            generateField(fullConfig, "Type", "type", tagRendering),
-            generateField(fullConfig, "Question", "question", tagRendering),
-            generateField(fullConfig, "Extra tags", "addExtraTags", tagRendering),
+            createFieldUI("Key", "key", tagRendering),
+            createFieldUI("Rendering", "render", tagRendering),
+            createFieldUI("Type", "type", tagRendering),
+            createFieldUI("Question", "question", tagRendering),
+            createFieldUI("Extra tags", "addExtraTags", tagRendering),
 
             ...(tagRendering.mappings ?? []).map((mapping) => {
-                return new MappingGenerator(fullConfig, layerConfig, tagRendering, mapping,
-                    generateField)
+                return new MappingGenerator(fullConfig, layerConfig, tagRendering, mapping)
             }),
             new Button("Add mapping", () => {
-                if(tagRendering.mappings === undefined){
+                if (tagRendering.mappings === undefined) {
                     tagRendering.mappings = []
                 }
                 tagRendering.mappings.push({if: "", then: ""});
-                self.CreateElements(fullConfig, layerConfig, tagRendering, generateField, isTitle);
+                self.CreateElements(fullConfig, layerConfig, tagRendering, isTitle);
                 self.Update();
             })
 
@@ -169,16 +150,15 @@ class PresetGenerator extends UIElement {
     private elements: UIElement[];
 
     constructor(fullConfig: UIEventSource<LayoutConfigJson>, layerConfig: LayerConfigJson,
-                preset0: { title?: string, description?: string, icon?: string, tags?: string | string[] | { k: string, v: string }[] },
-                generateField: (src: UIEventSource<any>, label: string, key: string, root: any, deflt?: string) => UIElement) {
+                preset0: { title?: string, description?: string, icon?: string, tags?: string | string[] | { k: string, v: string }[] }) {
         super(undefined);
         const self = this;
         this.elements = [
             new FixedUiElement("<h3>Preset</h3>"),
-            generateField(fullConfig, "Title", "title", preset0),
-            generateField(fullConfig, "Description", "description", preset0, layerConfig.description),
-            generateField(fullConfig, "icon", "icon", preset0, layerConfig.icon),
-            generateField(fullConfig, "tags", "tags", preset0, TagsToString(layerConfig.overpassTags)),
+            createFieldUI("Title", "title", preset0),
+            createFieldUI("Description", "description", preset0, {deflt: layerConfig.description}),
+            createFieldUI("icon", "icon", preset0, {deflt: layerConfig.icon}),
+            createFieldUI("tags", "tags", preset0, {deflt: TagsToString(layerConfig.overpassTags)}),
             new Button("Remove this preset", () => {
                 for (let i = 0; i < layerConfig.presets.length; i++) {
                     if (layerConfig.presets[i] === preset0) {
@@ -210,25 +190,24 @@ class LayerGenerator extends UIElement {
     private uielements: UIElement[];
 
     constructor(fullConfig: UIEventSource<LayoutConfigJson>,
-                layerConfig: LayerConfigJson,
-                generateField: ((src: UIEventSource<any>, label: string, key: string, root: any, deflt?: string) => UIElement)) {
+                layerConfig: LayerConfigJson) {
         super(undefined);
         this.layerConfig = new UIEventSource<LayerConfigJson>(layerConfig);
         this.fullConfig = fullConfig;
-        this.CreateElements(fullConfig, layerConfig, generateField)
+        this.CreateElements(fullConfig, layerConfig)
 
     }
 
-    private CreateElements(fullConfig: UIEventSource<LayoutConfigJson>, layerConfig: LayerConfigJson, generateField: (src: UIEventSource<any>, label: string, key: string, root: any, deflt?: string) => UIElement) {
+    private CreateElements(fullConfig: UIEventSource<LayoutConfigJson>, layerConfig: LayerConfigJson) {
         const self = this;
         this.uielements = [
-            generateField(fullConfig, "The name of this layer", "id", layerConfig),
-            generateField(fullConfig, "A description of objects for this layer", "description", layerConfig),
-            generateField(fullConfig, "The icon of this layer, either a URL or a base64-encoded svg", "icon", layerConfig),
-            generateField(fullConfig, "The default stroke color", "color", layerConfig),
-            generateField(fullConfig, "The minimal needed zoom to start loading", "minzoom", layerConfig),
-            generateField(fullConfig, "The tags to load from overpass", "overpassTags", layerConfig),
-            ...layerConfig.presets.map(preset => new PresetGenerator(fullConfig, layerConfig, preset, generateField)),
+            createFieldUI("The name of this layer", "id", layerConfig),
+            createFieldUI("A description of objects for this layer", "description", layerConfig),
+            createFieldUI("The icon of this layer, either a URL or a base64-encoded svg", "icon", layerConfig),
+            createFieldUI("The default stroke color", "color", layerConfig),
+            createFieldUI("The minimal needed zoom to start loading", "minzoom", layerConfig),
+            createFieldUI("The tags to load from overpass", "overpassTags", layerConfig),
+            ...layerConfig.presets.map(preset => new PresetGenerator(fullConfig, layerConfig, preset)),
             new Button("Add a preset", () => {
                 layerConfig.presets.push({
                     icon: undefined,
@@ -236,7 +215,7 @@ class LayerGenerator extends UIElement {
                     description: "",
                     tags: TagsToString(layerConfig.overpassTags)
                 });
-                self.CreateElements(fullConfig, layerConfig, generateField);
+                self.CreateElements(fullConfig, layerConfig);
                 self.Update();
             }),
             new TagRenderingGenerator(fullConfig, layerConfig, layerConfig.title ?? {
@@ -246,8 +225,8 @@ class LayerGenerator extends UIElement {
                 question: "",
                 render: "Title",
                 type: "text"
-            }, generateField, true),
-            ...layerConfig.tagRenderings.map(tr => new TagRenderingGenerator(fullConfig, layerConfig, tr, generateField)),
+            }, true),
+            ...layerConfig.tagRenderings.map(tr => new TagRenderingGenerator(fullConfig, layerConfig, tr)),
             new Button("Add a tag rendering", () => {
                 layerConfig.tagRenderings.push({
                     key: "",
@@ -257,7 +236,7 @@ class LayerGenerator extends UIElement {
                     render: "",
                     type: "text"
                 });
-                self.CreateElements(fullConfig, layerConfig, generateField);
+                self.CreateElements(fullConfig, layerConfig);
                 self.Update();
             }),
 
@@ -274,11 +253,9 @@ class AllLayerComponent extends UIElement {
 
     private tabs: TabbedComponent;
     private config: UIEventSource<LayoutConfigJson>;
-    private generateField: ((src: UIEventSource<any>, label: string, key: string, root: any, deflt?: string) => UIElement);
 
-    constructor(config: UIEventSource<LayoutConfigJson>, generateField: ((src: UIEventSource<any>, label: string, key: string, root: any, deflt?: string) => UIElement)) {
+    constructor(config: UIEventSource<LayoutConfigJson>) {
         super(undefined);
-        this.generateField = generateField;
         this.config = config;
         const self = this;
         let previousLayerAmount = config.data.layers.length;
@@ -302,7 +279,7 @@ class AllLayerComponent extends UIElement {
             });
             layerPanes.push({
                 header: new VariableUiElement(header),
-                content: new LayerGenerator(config, layer, this.generateField)
+                content: new LayerGenerator(config, layer)
             })
         }
 
@@ -360,53 +337,54 @@ export class ThemeGenerator extends UIElement {
         const jsonObjectRoot = this.themeObject.data;
 
         const base64 = this.themeObject.map(JSON.stringify).map(btoa);
-        this.url = base64.map((data) => `https://pietervdvn.github.io/MapComplete/index.html?userlayout=true#` + data);
+        this.url = base64.map((data) => `https://pietervdvn.github.io/MapComplete/index.html?test=true&userlayout=true#` + data);
         const self = this;
-        this.allQuestionFields = [
-            this.JsonField(this.themeObject, "Name of this theme", "name", jsonObjectRoot),
-            this.JsonField(this.themeObject, "Title (shown in the window and in the welcome message)", "title", jsonObjectRoot),
-            this.JsonField(this.themeObject, "Description (shown in the welcome message and various other places)", "description", jsonObjectRoot),
-            this.JsonField(this.themeObject, "The supported language", "language", jsonObjectRoot),
-            this.JsonField(this.themeObject, "startLat", "startLat", jsonObjectRoot),
-            this.JsonField(this.themeObject, "startLon", "startLon", jsonObjectRoot),
-            this.JsonField(this.themeObject, "startzoom", "startZoom", jsonObjectRoot),
-            this.JsonField(this.themeObject, "icon: either a URL to an image file, a relative url to a MapComplete asset ('./asset/help.svg') or a base64-encoded value (including 'data:image/svg+xml;base64,'", "icon", jsonObjectRoot, "./assets/bug.svg"),
 
-            new AllLayerComponent(this.themeObject, self.JsonField)
+        createFieldUI = (label, key, root, options) => {
+
+            const value = new UIEventSource<string>(TagsToString(root[key]) ?? options?.deflt);
+            value.addCallback((v) => {
+                root[key] = v;
+                self.themeObject.ping(); // We assume the root is a part of the themeObject
+            })
+            return new Combine([
+                label,
+                new TextField<string>({
+                    fromString: (str) => str,
+                    toString: (str) => str,
+                    value: value
+                })]);
+        }
+
+        this.allQuestionFields = [
+            createFieldUI("Name of this theme", "name", jsonObjectRoot),
+            createFieldUI("Title (shown in the window and in the welcome message)", "title", jsonObjectRoot),
+            createFieldUI("Description (shown in the welcome message and various other places)", "description", jsonObjectRoot),
+            createFieldUI("The supported language", "language", jsonObjectRoot),
+            createFieldUI("startLat", "startLat", jsonObjectRoot),
+            createFieldUI("startLon", "startLon", jsonObjectRoot),
+            createFieldUI("startzoom", "startZoom", jsonObjectRoot),
+            createFieldUI("icon: either a URL to an image file, a relative url to a MapComplete asset ('./asset/help.svg') or a base64-encoded value (including 'data:image/svg+xml;base64,'", "icon", jsonObjectRoot, {deflt: "./assets/bug.svg"}),
+
+            new AllLayerComponent(this.themeObject)
         ]
 
 
     }
 
-
-    private JsonField(themeObject: UIEventSource<LayoutConfigJson>, label: string, key: string, root: any, deflt: string = "") {
-        const value = new UIEventSource<string>(TagsToString(root[key]) ?? deflt);
-        value.addCallback((v) => {
-            root[key] = v;
-            themeObject.ping(); // We assume the root is a part of the themeObject
-        })
-        return new Combine([
-            label,
-            new TextField<string>({
-                fromString: (str) => str,
-                toString: (str) => str,
-                value: value
-            })]);
-    }
-
     InnerRender(): string {
 
         if (!this.userDetails.data.loggedIn) {
-            return "Not logged in"
+            return "Not logged in. You need to be logged in to create a theme."
         }
         if (this.userDetails.data.csCount < 500) {
-            return "You need at least 500 changesets to create your own theme";
+            return "You need at least 500 changesets to create your own theme.";
         }
 
 
         return new VerticalCombine([
             // new VariableUiElement(this.themeObject.map(JSON.stringify)),
-            new VariableUiElement(this.url.map((url) => `Current URL: <a href="${url}" target="_blank">Click here to open</a>`)),
+            //  new VariableUiElement(this.url.map((url) => `Current URL: <a href="${url}" target="_blank">Click here to open</a>`)),
             ...this.allQuestionFields,
         ]).Render();
     }
diff --git a/UI/FeatureInfoBox.ts b/UI/FeatureInfoBox.ts
index a1d8690dab..26b4e2d5b1 100644
--- a/UI/FeatureInfoBox.ts
+++ b/UI/FeatureInfoBox.ts
@@ -1,5 +1,4 @@
 import {UIElement} from "./UIElement";
-import {UIEventSource} from "./UIEventSource";
 import {ImageCarousel} from "./Image/ImageCarousel";
 import {VerticalCombine} from "./Base/VerticalCombine";
 import {OsmLink} from "../Customizations/Questions/OsmLink";
diff --git a/UI/FullScreenMessageBoxHandler.ts b/UI/FullScreenMessageBoxHandler.ts
index 1f0a97b7c5..b7f09f18be 100644
--- a/UI/FullScreenMessageBoxHandler.ts
+++ b/UI/FullScreenMessageBoxHandler.ts
@@ -1,8 +1,8 @@
-import {UIEventSource} from "./UIEventSource";
 import {UIElement} from "./UIElement";
 import {VariableUiElement} from "./Base/VariableUIElement";
 import Translations from "./i18n/Translations";
 import {State} from "../State";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 /**
  * Handles the full screen popup on mobile
diff --git a/UI/Image/ImageCarousel.ts b/UI/Image/ImageCarousel.ts
index dc2033c6f1..0f9f19c4a2 100644
--- a/UI/Image/ImageCarousel.ts
+++ b/UI/Image/ImageCarousel.ts
@@ -1,16 +1,15 @@
 import {UIElement} from "../UIElement";
 import {ImageSearcher} from "../../Logic/ImageSearcher";
-import {UIEventSource} from "../UIEventSource";
 import {SlideShow} from "../SlideShow";
 import {FixedUiElement} from "../Base/FixedUiElement";
 import {VariableUiElement} from "../Base/VariableUIElement";
 import {ConfirmDialog} from "../ConfirmDialog";
+import {UIEventSource} from "../../Logic/UIEventSource";
 import {
     Dependencies,
     TagDependantUIElement,
     TagDependantUIElementConstructor
 } from "../../Customizations/UIElementConstructor";
-import {Changes} from "../../Logic/Osm/Changes";
 import {State} from "../../State";
 
 export class ImageCarouselConstructor implements TagDependantUIElementConstructor{
diff --git a/UI/Image/ImgurImage.ts b/UI/Image/ImgurImage.ts
index 01dd4798a5..e54ab8cb62 100644
--- a/UI/Image/ImgurImage.ts
+++ b/UI/Image/ImgurImage.ts
@@ -1,7 +1,7 @@
-import {UIEventSource} from "../UIEventSource";
 import {UIElement} from "../UIElement";
-import {LicenseInfo} from "../../Logic/Wikimedia";
-import {Imgur} from "../../Logic/Imgur";
+import {UIEventSource} from "../../Logic/UIEventSource";
+import {LicenseInfo} from "../../Logic/Web/Wikimedia";
+import {Imgur} from "../../Logic/Web/Imgur";
 
 
 export class    ImgurImage extends UIElement {
diff --git a/UI/Image/SimpleImageElement.ts b/UI/Image/SimpleImageElement.ts
index 1509ac18cb..c17f0fa49a 100644
--- a/UI/Image/SimpleImageElement.ts
+++ b/UI/Image/SimpleImageElement.ts
@@ -1,5 +1,5 @@
 import {UIElement} from "../UIElement";
-import {UIEventSource} from "../UIEventSource";
+import {UIEventSource} from "../../Logic/UIEventSource";
 
 
 export class SimpleImageElement extends UIElement {
diff --git a/UI/Image/WikimediaImage.ts b/UI/Image/WikimediaImage.ts
index ed71b3c2e0..6354716c57 100644
--- a/UI/Image/WikimediaImage.ts
+++ b/UI/Image/WikimediaImage.ts
@@ -1,6 +1,6 @@
-import {UIEventSource} from "../UIEventSource";
 import {UIElement} from "../UIElement";
-import {LicenseInfo, Wikimedia} from "../../Logic/Wikimedia";
+import {LicenseInfo, Wikimedia} from "../../Logic/Web/Wikimedia";
+import {UIEventSource} from "../../Logic/UIEventSource";
 
 
 export class WikimediaImage extends UIElement {
diff --git a/UI/ImageUploadFlow.ts b/UI/ImageUploadFlow.ts
index 7f1b3401e7..1852381e4c 100644
--- a/UI/ImageUploadFlow.ts
+++ b/UI/ImageUploadFlow.ts
@@ -1,7 +1,5 @@
 import {UIElement} from "./UIElement";
-import {UIEventSource} from "./UIEventSource";
 import $ from "jquery"
-import {Imgur} from "../Logic/Imgur";
 import {UserDetails} from "../Logic/Osm/OsmConnection";
 import {DropDown} from "./Input/DropDown";
 import {VariableUiElement} from "./Base/VariableUIElement";
@@ -10,6 +8,8 @@ import {fail} from "assert";
 import Combine from "./Base/Combine";
 import {VerticalCombine} from "./Base/VerticalCombine";
 import {State} from "../State";
+import {UIEventSource} from "../Logic/UIEventSource";
+import {Imgur} from "../Logic/Web/Imgur";
 
 export class ImageUploadFlow extends UIElement {
     private _licensePicker: UIElement;
diff --git a/UI/Input/CheckBox.ts b/UI/Input/CheckBox.ts
index f2da2e7bbe..20357e6b56 100644
--- a/UI/Input/CheckBox.ts
+++ b/UI/Input/CheckBox.ts
@@ -1,9 +1,7 @@
 import {UIElement} from "../UIElement";
-import {UIEventSource} from "../UIEventSource";
 import { FilteredLayer } from "../../Logic/FilteredLayer";
 import Translations from "../../UI/i18n/Translations";
-import instantiate = WebAssembly.instantiate;
-
+import {UIEventSource} from "../../Logic/UIEventSource";
 
 export class CheckBox extends UIElement{
     public readonly isEnabled: UIEventSource<boolean>;
diff --git a/UI/Input/DropDown.ts b/UI/Input/DropDown.ts
index 7e0db2aa6b..3d71c0ccf2 100644
--- a/UI/Input/DropDown.ts
+++ b/UI/Input/DropDown.ts
@@ -1,9 +1,7 @@
-import {UIEventSource} from "../UIEventSource";
 import {UIElement} from "../UIElement";
 import {InputElement} from "./InputElement";
-import instantiate = WebAssembly.instantiate;
-import {FixedUiElement} from "../Base/FixedUiElement";
 import Translations from "../i18n/Translations";
+import {UIEventSource} from "../../Logic/UIEventSource";
 
 export class DropDown<T> extends InputElement<T> {
 
diff --git a/UI/Input/FixedInputElement.ts b/UI/Input/FixedInputElement.ts
index 0cada259e9..8ce465748b 100644
--- a/UI/Input/FixedInputElement.ts
+++ b/UI/Input/FixedInputElement.ts
@@ -1,8 +1,7 @@
 import {InputElement} from "./InputElement";
-import {UIEventSource} from "../UIEventSource";
 import {UIElement} from "../UIElement";
 import {FixedUiElement} from "../Base/FixedUiElement";
-
+import {UIEventSource} from "../../Logic/UIEventSource";
 
 export class FixedInputElement<T> extends InputElement<T> {
     private rendering: UIElement;
diff --git a/UI/Input/InputElement.ts b/UI/Input/InputElement.ts
index f1e4bb7f14..e9f750797f 100644
--- a/UI/Input/InputElement.ts
+++ b/UI/Input/InputElement.ts
@@ -1,7 +1,6 @@
 import {UIElement} from "../UIElement";
-import {UIEventSource} from "../UIEventSource";
 import {FixedUiElement} from "../Base/FixedUiElement";
-
+import {UIEventSource} from "../../Logic/UIEventSource";
 export abstract class InputElement<T> extends UIElement{
     
     abstract GetValue() : UIEventSource<T>;
diff --git a/UI/Input/InputElementWrapper.ts b/UI/Input/InputElementWrapper.ts
index 60f7416ffd..7128a961a8 100644
--- a/UI/Input/InputElementWrapper.ts
+++ b/UI/Input/InputElementWrapper.ts
@@ -1,9 +1,8 @@
 import {InputElement} from "./InputElement";
-import {UIEventSource} from "../UIEventSource";
 import {UIElement} from "../UIElement";
 import {FixedUiElement} from "../Base/FixedUiElement";
 import Translations from "../i18n/Translations";
-
+import {UIEventSource} from "../../Logic/UIEventSource";
 
 export class InputElementWrapper<T> extends InputElement<T>{
     private pre: UIElement ;
diff --git a/UI/Input/RadioButton.ts b/UI/Input/RadioButton.ts
index 8d8b5cc5e3..1338af5020 100644
--- a/UI/Input/RadioButton.ts
+++ b/UI/Input/RadioButton.ts
@@ -1,6 +1,5 @@
-import {UIElement} from "../UIElement";
-import {UIEventSource} from "../UIEventSource";
 import {InputElement} from "./InputElement";
+import {UIEventSource} from "../../Logic/UIEventSource";
 
 export class RadioButton<T> extends InputElement<T> {
 
diff --git a/UI/Input/TextField.ts b/UI/Input/TextField.ts
index 4074ee526a..140216c8ca 100644
--- a/UI/Input/TextField.ts
+++ b/UI/Input/TextField.ts
@@ -1,8 +1,7 @@
 import {UIElement} from "../UIElement";
-import {UIEventSource} from "../UIEventSource";
 import {InputElement} from "./InputElement";
 import Translations from "../i18n/Translations";
-
+import {UIEventSource} from "../../Logic/UIEventSource";
 
 export class TextField<T> extends InputElement<T> {
 
diff --git a/UI/MoreScreen.ts b/UI/MoreScreen.ts
index c876d74742..66d071d2c8 100644
--- a/UI/MoreScreen.ts
+++ b/UI/MoreScreen.ts
@@ -62,8 +62,7 @@ export class MoreScreen extends UIElement {
             tr.intro,
             tr.requestATheme,
             new VerticalCombine(els),
-            tr.streetcomplete,
-            new FixedUiElement(State.vNumber)
+            tr.streetcomplete
         ]).Render();
     }
 
diff --git a/UI/PendingChanges.ts b/UI/PendingChanges.ts
index 1c6c981e27..68f114be6a 100644
--- a/UI/PendingChanges.ts
+++ b/UI/PendingChanges.ts
@@ -1,7 +1,6 @@
 import {UIElement} from "./UIElement";
-import {UIEventSource} from "./UIEventSource";
-import {Changes} from "../Logic/Osm/Changes";
 import {State} from "../State";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 export class PendingChanges extends UIElement {
     private _pendingChangesCount: UIEventSource<number>;
diff --git a/UI/SaveButton.ts b/UI/SaveButton.ts
index a2728c41f0..a9b9b7e3f5 100644
--- a/UI/SaveButton.ts
+++ b/UI/SaveButton.ts
@@ -1,6 +1,6 @@
-import {UIEventSource} from "./UIEventSource";
 import {UIElement} from "./UIElement";
 import Translations from "./i18n/Translations";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 export class SaveButton extends UIElement {
     private _value: UIEventSource<any>;
diff --git a/UI/SearchAndGo.ts b/UI/SearchAndGo.ts
index 23d9ee5041..56ffdaea1b 100644
--- a/UI/SearchAndGo.ts
+++ b/UI/SearchAndGo.ts
@@ -1,5 +1,4 @@
 import Locale from "./i18n/Locale";
-import {UIEventSource} from "./UIEventSource";
 import {UIElement} from "./UIElement";
 import Translation from "./i18n/Translation";
 import {VariableUiElement} from "./Base/VariableUIElement";
@@ -7,9 +6,9 @@ import {FixedUiElement} from "./Base/FixedUiElement";
 import {TextField} from "./Input/TextField";
 import {Geocoding} from "../Logic/Osm/Geocoding";
 import Translations from "./i18n/Translations";
-import {Basemap} from "../Logic/Leaflet/Basemap";
 import {State} from "../State";
 
+import {UIEventSource} from "../Logic/UIEventSource";
 
 export class SearchAndGo extends UIElement {
 
diff --git a/UI/ShareScreen.ts b/UI/ShareScreen.ts
index 97a69ea79a..831c7f3372 100644
--- a/UI/ShareScreen.ts
+++ b/UI/ShareScreen.ts
@@ -1,18 +1,16 @@
 import {UIElement} from "./UIElement";
-import {Layout} from "../Customizations/Layout";
 import Translations from "./i18n/Translations";
 import {FixedUiElement} from "./Base/FixedUiElement";
 import Combine from "./Base/Combine";
 import {VariableUiElement} from "./Base/VariableUIElement";
-import {UIEventSource} from "./UIEventSource";
 import {CheckBox} from "./Input/CheckBox";
 import {VerticalCombine} from "./Base/VerticalCombine";
-import {QueryParameters} from "../Logic/QueryParameters";
 import {Img} from "./Img";
 import {State} from "../State";
 import {Basemap} from "../Logic/Leaflet/Basemap";
 import {FilteredLayer} from "../Logic/FilteredLayer";
 import {Utils} from "../Utils";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 export class ShareScreen extends UIElement {
 
@@ -147,7 +145,7 @@ export class ShareScreen extends UIElement {
         this._iframeCode = new VariableUiElement(
             url.map((url) => {
                 return `<span class='literal-code iframe-code-block'>
-                        &lt;iframe src="${url}" width="100%" height="100%" title="${layout.name} with MapComplete"&gt;&lt;/iframe&gt 
+                        &lt;iframe src="${url}" width="100%" height="100%" title="${layout.title.InnerRender()} with MapComplete"&gt;&lt;/iframe&gt 
                     </span>`
             })
         );
diff --git a/UI/SimpleAddUI.ts b/UI/SimpleAddUI.ts
index eb63c05fc3..8d1b8985db 100644
--- a/UI/SimpleAddUI.ts
+++ b/UI/SimpleAddUI.ts
@@ -1,18 +1,13 @@
 import {UIElement} from "./UIElement";
-import {UIEventSource} from "./UIEventSource";
 import {Tag} from "../Logic/TagsFilter";
 import {FilteredLayer} from "../Logic/FilteredLayer";
-import {FixedUiElement} from "./Base/FixedUiElement";
-import {Button} from "./Base/Button";
 import Translations from "./i18n/Translations";
 import Combine from "./Base/Combine";
 import {SubtleButton} from "./Base/SubtleButton";
-import {VerticalCombine} from "./Base/VerticalCombine";
 import Locale from "./i18n/Locale";
-import {Changes} from "../Logic/Osm/Changes";
-import {UserDetails} from "../Logic/Osm/OsmConnection";
 import {State} from "../State";
 
+import {UIEventSource} from "../Logic/UIEventSource";
 
 /**
  * Asks to add a feature at the last clicked location, at least if zoom is sufficient
diff --git a/UI/SlideShow.ts b/UI/SlideShow.ts
index 254c03a9f4..c6fc1bf4de 100644
--- a/UI/SlideShow.ts
+++ b/UI/SlideShow.ts
@@ -1,6 +1,6 @@
 import {UIElement} from "./UIElement";
-import {UIEventSource} from "./UIEventSource";
 import {FixedUiElement} from "./Base/FixedUiElement";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 export class SlideShow extends UIElement {
 
diff --git a/UI/UIElement.ts b/UI/UIElement.ts
index 96016b834b..6df394a5de 100644
--- a/UI/UIElement.ts
+++ b/UI/UIElement.ts
@@ -1,5 +1,4 @@
-import {UIEventSource} from "./UIEventSource";
-import {TagDependantUIElement} from "../Customizations/UIElementConstructor";
+import {UIEventSource} from "../Logic/UIEventSource";
 
 export abstract class UIElement extends UIEventSource<string>{
     
@@ -11,7 +10,11 @@ export abstract class UIElement extends UIEventSource<string>{
     
     private _hideIfEmpty = false;
     
-    // WOrkaround as document is not defined
+    /**
+     * In the 'deploy'-step, some code needs to be run by ts-node.
+     * However, ts-node crashes when it sees 'document'. When running from console, we flag this and disable all code where document is needed.
+     * This is a workaround and yet another hack
+     */
     public static runningFromConsole = false;
 
     protected constructor(source: UIEventSource<any>) {
diff --git a/UI/UserBadge.ts b/UI/UserBadge.ts
index 757cc440a5..07c077a113 100644
--- a/UI/UserBadge.ts
+++ b/UI/UserBadge.ts
@@ -5,11 +5,11 @@ import {FixedUiElement} from "./Base/FixedUiElement";
 import {VariableUiElement} from "./Base/VariableUIElement";
 import Translations from "./i18n/Translations";
 import {UserDetails} from "../Logic/Osm/OsmConnection";
-import {Basemap} from "../Logic/Leaflet/Basemap";
 import {State} from "../State";
 import {PendingChanges} from "./PendingChanges";
-import Locale from "./i18n/Locale";
 import {Utils} from "../Utils";
+// @ts-ignore
+import {UIEventSource} from "../Logic/UIEventSource";
 
 /**
  * Handles and updates the user badge
diff --git a/UI/WelcomeMessage.ts b/UI/WelcomeMessage.ts
index 1f1529e13a..0263cfef68 100644
--- a/UI/WelcomeMessage.ts
+++ b/UI/WelcomeMessage.ts
@@ -1,5 +1,4 @@
 import {UIElement} from "../UI/UIElement";
-import {UIEventSource} from "../UI/UIEventSource";
 import {OsmConnection, UserDetails} from "../Logic/Osm/OsmConnection";
 import Locale from "../UI/i18n/Locale";
 import {State} from "../State";
@@ -7,6 +6,8 @@ import {Layout} from "../Customizations/Layout";
 import Translations from "./i18n/Translations";
 import {VariableUiElement} from "./Base/VariableUIElement";
 import {Utils} from "../Utils";
+import {UIEventSource} from "../Logic/UIEventSource";
+
 
 export class WelcomeMessage extends UIElement {
     private readonly layout: Layout;
diff --git a/UI/i18n/Locale.ts b/UI/i18n/Locale.ts
index 9a40fb3239..1b4a343840 100644
--- a/UI/i18n/Locale.ts
+++ b/UI/i18n/Locale.ts
@@ -1,6 +1,6 @@
-import {UIEventSource} from "../UIEventSource";
-import {LocalStorageSource} from "../../Logic/LocalStorageSource";
+import {UIEventSource} from "../../Logic/UIEventSource";
 import {UIElement} from "../UIElement";
+import {LocalStorageSource} from "../../Logic/Web/LocalStorageSource";
 
 
 export default class Locale {
diff --git a/assets/themes/bookcases/Bookcases.json b/assets/themes/bookcases/Bookcases.json
new file mode 100644
index 0000000000..4df83324db
--- /dev/null
+++ b/assets/themes/bookcases/Bookcases.json
@@ -0,0 +1,67 @@
+{
+  "layers": [
+    {
+      "id": "bookcases",
+      "title": {
+        "render": "Bookcase"
+      },
+      "icon": "./assets/themes/bookcases/bookcase.svg",
+      "color": "#000000",
+      "description": "A public bookcase",
+      "minzoom": "12",
+      "overpassTags": "amenity=public_bookcase",
+      "presets": [
+        {
+          "title": "Bookcase",
+          "description": "A bookcase is a small cabinet where everyone can take or leave a book",
+          "icon": "./assets/bookcase.svg",
+          "tags": "amenity=public_bookcase"
+        }
+      ],
+      "tagRenderings": [
+        {
+          "key": "brand",
+          "addExtraTags": "",
+          "mappings": [
+            {
+              "if": "brand=Little Free Library",
+              "then": "Part of the network Little Free Library"
+            }
+          ],
+          "question": "Is this bookcase part of a network?",
+          "render": "Part of {brand}",
+          "type": "text"
+        },
+        {
+          "key": "",
+          "addExtraTags": "",
+          "mappings": [
+            {
+              "if": "books=children",
+              "then": "Mainly books for kids"
+            },
+            {
+              "if": "books=adult",
+              "then": "Mainly books for adults"
+            },
+            {
+              "if": "books=adult;children",
+              "then": "Books for both adults and children"
+            }
+          ],
+          "question": "Which books can be found here?",
+          "render": "",
+          "type": "text"
+        }
+      ]
+    }
+  ],
+  "icon": "./assets/bookcase.svg",
+  "name": "bookcases",
+  "title": "Bookcases",
+  "description": "Welcome to open Bookcase Map",
+  "language": "en",
+  "startLat": "0",
+  "startLon": "0",
+  "startZoom": "12"
+}
\ No newline at end of file
diff --git a/assets/themes/bookcases/bookcase.svg b/assets/themes/bookcases/bookcase.svg
new file mode 100644
index 0000000000..d6feeeb74b
--- /dev/null
+++ b/assets/themes/bookcases/bookcase.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 64 64"
+   height="64"
+   width="64"
+   id="svg109"
+   version="1.1"
+   sodipodi:docname="Public_bookcase-14.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="8.4285714"
+     inkscape:cx="21.124627"
+     inkscape:cy="25.918314"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer2" />
+  <metadata
+     id="metadata115">
+    <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>
+  <defs
+     id="defs113" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="background">
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.49738699;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path819"
+       cx="31.967007"
+       cy="32.109043"
+       rx="32.00938"
+       ry="31.946436" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="icon">
+    <path
+       id="path4176"
+       d="M 32.123859,10.440678 8.6779661,17.139504 v 3.349413 L 32.123859,13.79009 55.569753,20.488917 v -3.349413 z m -11.59865,11.964995 c -0.522431,0.02077 -1.041409,0.124297 -1.556954,0.320538 v 20.835706 c 0,0 8.38755,-0.322013 10.525792,7.817477 V 29.497007 c -1.631616,-3.400613 -5.311804,-7.237191 -8.968838,-7.091334 z m 8.968838,28.973731 C 24.066203,47.228261 16.331902,46.172115 16.331902,46.172115 V 26.376556 l -2.629816,-1.046692 v 23.445893 l 15.791961,5.207293 h 5.259628 L 50.545632,48.775757 V 25.329864 l -2.629812,1.046692 v 20.835709 l -13.162145,4.167139 c -1.754454,-0.663351 -3.795938,-0.545319 -5.259628,0 z M 45.279464,22.726221 C 40.03579,22.448689 33.986193,25.566152 30.808953,28.247518 v 22.045945 c 2.933724,-2.408355 8.190227,-5.573982 14.470511,-6.208191 z"
+       style="fill:#734a08;fill-opacity:1;stroke:none;stroke-width:3.34941339"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/assets/walkbybrussels/artwork.svg b/assets/walkbybrussels/artwork.svg
deleted file mode 100644
index fba5612f61..0000000000
--- a/assets/walkbybrussels/artwork.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st3" d="M22.18,92.56c0,0,0,0.01,0.01,0.01c0.97,0.56,2.04,1.14,3.22,1.69c0,0,0,0,0,0
-		C24.23,93.71,23.15,93.13,22.18,92.56C22.19,92.56,22.18,92.56,22.18,92.56z"/>
-	<path class="st3" d="M31.45,55.28c1.33-3.83-0.4-8.1-3.87-9.52c-3.47-1.42-7.37,0.55-8.7,4.38c-1.33,3.83,0.4,8.1,3.86,9.52
-		C26.21,61.08,30.12,59.12,31.45,55.28z"/>
-	<path class="st3" d="M20.76,94.39c0.46,0.34,0.92,0.67,1.38,0.97C21.68,95.05,21.22,94.73,20.76,94.39
-		C20.76,94.39,20.76,94.39,20.76,94.39z"/>
-	<path class="st3" d="M22.13,95.37C22.13,95.36,22.13,95.36,22.13,95.37c-0.44,0.29-1.01,0.3-1.49,0c0,0,0.01,0.01,0.01,0.01
-		C21.12,95.67,21.69,95.65,22.13,95.37z"/>
-	<path class="st3" d="M35.74,71c-3.18-1.31-6.76,0.5-7.99,4.01c-1.22,3.52,0.36,7.44,3.55,8.74c3.18,1.3,6.77-0.5,7.99-4.02
-		C40.51,76.22,38.92,72.3,35.74,71z"/>
-	<path class="st3" d="M38.64,22.51c-3.47-1.42-7.37,0.55-8.7,4.38c-1.33,3.83,0.4,8.1,3.86,9.52c3.47,1.42,7.37-0.54,8.7-4.37
-		C43.84,28.2,42.1,23.93,38.64,22.51z"/>
-	<path class="st3" d="M58.97,13.28c-2.59-1.06-5.51,0.41-6.5,3.27c-0.99,2.86,0.3,6.06,2.88,7.11c2.59,1.06,5.5-0.41,6.5-3.27
-		C62.85,17.53,61.56,14.34,58.97,13.28z"/>
-	<path class="st4" d="M91.37,11.51C63.22-7.72,24.2-3.67,8.98,29.84c-6.77,14.91-6.89,31.7-0.36,49.91
-		c0.26,0.73,0.54,1.44,0.85,2.13c3.34,5.36,7.29,9.52,11.29,12.5c0,0,0,0-0.01,0c0,0,0,0,0,0c-4.01-2.97-7.95-7.15-11.29-12.5
-		c2.38,5.47,6.06,10,10.75,13.2c0,0,0,0,0,0c0.07,0.05,0.15,0.1,0.22,0.15c-0.07-0.05-0.16-0.1-0.22-0.14
-		c0.14,0.09,0.28,0.19,0.42,0.29c0.01,0.01,0.02,0,0.03,0.01c0,0-0.01-0.01-0.01-0.01c0.48,0.31,1.05,0.29,1.49,0
-		c0,0,0,0.01-0.01,0.01c-0.44,0.29-1.01,0.3-1.48,0.01c0.46,0.31,0.92,0.63,1.46,0.95c0.71,0.42,1.5,0.84,2.35,1.22
-		c1.46,0.66,2.81,1.1,3.98,1.39c-0.39-0.11-0.78-0.22-1.17-0.36c-0.03-0.01-0.06-0.02-0.09-0.04c-0.25-0.1-0.41-0.33-0.57-0.55
-		c0.16,0.22,0.32,0.44,0.57,0.55c0.03,0.01,0.06,0.02,0.09,0.04c0.39,0.13,0.78,0.24,1.17,0.36c0.02-0.08,0.04-0.17,0.06-0.26
-		c-0.69-0.25-1.39-0.54-2.1-0.87c0,0,0,0,0,0c0,0-0.01,0-0.01-0.01c-0.18-0.36-0.23-0.81-0.11-1.24c0.18-0.65,0.7-1.09,1.28-1.16
-		c-0.57,0.07-1.08,0.51-1.27,1.16c-0.12,0.44-0.07,0.88,0.11,1.25c0.71,0.33,1.41,0.63,2.1,0.88c0.22-0.97,0.44-1.94,0.67-2.91
-		c0,0,0,0,0.01,0c-0.22,0.97-0.45,1.94-0.67,2.91c0,0,0,0-0.01,0c-0.02,0.09-0.04,0.17-0.06,0.26c0.84,0.24,1.71,0.34,2.57,0.5
-		c0.61,0.14,1.21,0.27,1.8,0.35c0.01,0.01,0.03,0.01,0.04,0.01c6.81,0.9,13.49-1.31,13.49-1.31c1.59-0.53,2.78-1.06,3.24-1.28
-		c2.42-1.14,7.4-3.49,11.36-9.09c2.54-3.6,3.58-7.02,4.08-8.74c1.32-4.51,1.48-8.71,1.22-12.11c-0.66-4.62-1.43-8.2-2.02-10.64
-		c-0.46-1.89-0.91-3.52-0.89-5.91c0.02-2.08,0.39-4.15,1.11-6.22c3.02-8.69,9.97-12.71,20.65-11.95c4.86,0.35,9-2.74,10.54-7.86
-		C96.93,20.45,96.1,14.74,91.37,11.51z M20.76,94.39C20.76,94.39,20.76,94.39,20.76,94.39c0.46,0.34,0.92,0.66,1.38,0.97
-		C21.68,95.05,21.22,94.73,20.76,94.39z M25.41,94.26c-1.18-0.55-2.25-1.13-3.22-1.69c0,0,0-0.01-0.01-0.01c0,0,0,0,0,0
-		C23.15,93.13,24.23,93.71,25.41,94.26C25.41,94.26,25.41,94.26,25.41,94.26z M22.74,59.66c-3.46-1.42-5.2-5.68-3.86-9.52
-		c1.33-3.83,5.24-5.79,8.7-4.38c3.47,1.42,5.2,5.68,3.87,9.52C30.12,59.12,26.21,61.08,22.74,59.66z M39.28,79.74
-		c-1.22,3.52-4.8,5.32-7.99,4.02c-3.18-1.3-4.77-5.22-3.55-8.74c1.23-3.52,4.81-5.32,7.99-4.01C38.92,72.3,40.51,76.22,39.28,79.74z
-		 M42.51,32.03c-1.33,3.83-5.24,5.8-8.7,4.37c-3.46-1.42-5.2-5.69-3.86-9.52c1.33-3.83,5.24-5.79,8.7-4.38
-		C42.1,23.93,43.84,28.2,42.51,32.03z M61.85,20.39c-1,2.86-3.91,4.33-6.5,3.27c-2.59-1.06-3.88-4.25-2.88-7.11
-		c0.99-2.86,3.91-4.33,6.5-3.27S62.85,17.53,61.85,20.39z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/bench_black.svg b/assets/walkbybrussels/bench_black.svg
deleted file mode 100644
index e13b399d15..0000000000
--- a/assets/walkbybrussels/bench_black.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<rect x="1.2" y="58.1" width="97.8" height="11"/>
-	<rect x="9.3" y="26.9" width="79.8" height="11"/>
-	<rect x="9.4" y="12.9" width="79.8" height="11"/>
-	<path d="M93.9,49.3c-29.6,0-59.2,0-88.8,0c-0.9,2.1-1.9,4.2-2.8,6.2c31.7,0,63.5,0,95.2,0C96.3,53.5,95.1,51.4,93.9,49.3z"/>
-	<path d="M9,40.9C8,42.9,7.1,45,6.2,47.1C35,47,63.7,47,92.5,46.9c-1.2-2-2.3-4-3.5-6C62.4,40.9,35.7,40.9,9,40.9z"/>
-	<rect x="10.1" y="71.2" width="5.5" height="21.2"/>
-	<rect x="82" y="71.2" width="5.5" height="21.2"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/building.svg b/assets/walkbybrussels/building.svg
deleted file mode 100644
index 333d222a0b..0000000000
--- a/assets/walkbybrussels/building.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st2" d="M50.8,0.5c-0.51-0.25-1.09-0.25-1.6,0L0.15,24.65h99.7L50.8,0.5z"/>
-	<path class="st2" d="M0.15,30.26c0,2.51,1.79,4.55,4.01,4.55h8.62v64.66h10.63V34.81h21.2v64.88H50h5.38V34.81h21.06v64.66h10.63
-		V34.81h8.76c2.22,0,4.01-2.04,4.01-4.55v-5.61H0.15V30.26z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/bus_black.svg b/assets/walkbybrussels/bus_black.svg
deleted file mode 100644
index 4b19aef520..0000000000
--- a/assets/walkbybrussels/bus_black.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:none;}
-</style>
-<g>
-	<path class="st0" d="M56.4,11.6c-1-0.6-2-0.9-3.3-0.9c-0.8,0-1.5,0.2-2.2,0.6c-2,1.2-2,4.1-0.9,5.4c0.5,0.6,1.2,1,2,1.3
-		c0.5,0.2,1,0.4,1.5,0.8c0.5,0.4,0.7,0.9,0.6,1.5c-0.2,1-1,1.6-2,1.5c-0.6,0-1.2-0.3-1.8-0.7C50.2,21,50.1,21,50,21.3
-		c-0.2,0.4-0.4,0.8-0.6,1.2c-0.1,0.3-0.1,0.4,0.2,0.5c0.9,0.5,1.8,0.8,2.8,0.8c1.1,0,2.1-0.3,2.9-1c1.5-1.4,1.8-4.3-0.5-5.7
-		c-0.4-0.2-0.8-0.4-1.2-0.6c-0.5-0.3-1.1-0.5-1.6-0.9c-1-0.9-0.8-2.3,0.4-2.8c0.5-0.2,0.9-0.2,1.4-0.1c0.6,0.1,1.1,0.4,1.6,0.7
-		c0.1,0.1,0.2,0.1,0.3-0.1c0.2-0.4,0.5-0.9,0.7-1.3C56.6,11.8,56.6,11.7,56.4,11.6z"/>
-	<path class="st0" d="M66.2,10.9c-2.8,0-5.5,0-8.3,0c-0.2,0-0.3,0.1-0.3,0.3c0,0.5,0,0.9,0,1.4c0,0.2,0.1,0.3,0.3,0.3
-		c0.9,0,1.8,0,2.8,0c0.2,0,0.3,0.1,0.3,0.3c0,1.7,0,3.3,0,5c0,0-0.1,0-0.1,0c0,1.7,0,3.3,0,5c0,0.2,0,0.3,0.3,0.3c0.6,0,1.1,0,1.7,0
-		c0.2,0,0.2,0,0.2-0.3c0-0.9,0-1.7,0-2.6c0-2.5,0-4.9,0-7.4c0-0.3,0.1-0.4,0.4-0.4c0.9,0,1.8,0,2.7,0c0.2,0,0.3-0.1,0.3-0.3
-		c0-0.5,0-0.9,0-1.4C66.5,11,66.4,10.9,66.2,10.9z"/>
-	<path class="st0" d="M34.2,38.8c1-0.1,2-0.2,3-0.3c1-0.1,2-0.2,3-0.3c0.4,0,0.4,0,0.3-0.4c-0.1-0.6-0.1-1.1-0.2-1.7
-		c0-0.2-0.1-0.3-0.3-0.2c-1.2,0.2-2.5,0.4-3.7,0.6c-1.5,0.2-3,0.5-4.5,0.7c-1.1,0.2-2.2,0.3-3.3,0.5c-0.2,0-0.2,0.1-0.2,0.2
-		c0,0.6,0,1.2,0,1.8c0,0.2,0.1,0.3,0.3,0.4c3,1.1,6,2.2,9,3.3c0.1,0,0.2,0,0.3,0.2c-1.2,0.4-2.4,0.8-3.6,1.2
-		c-1.9,0.6-3.8,1.2-5.7,1.8c-0.1,0-0.2,0.1-0.2,0.3c0,0.6,0,1.3,0,1.9c0,0.2,0,0.2,0.2,0.3c0.3,0,0.7,0.1,1,0.2
-		c3.5,0.7,7,1.3,10.5,2c0.2,0,0.2,0,0.3-0.2c0-0.5,0.1-1,0.2-1.5c0.1-0.5,0.1-0.5-0.4-0.5c-1.2-0.2-2.4-0.3-3.5-0.5
-		c-1.4-0.2-2.8-0.4-4.2-0.6c-0.4,0-0.8-0.1-1.2-0.2c0.1-0.1,0.3-0.2,0.4-0.2c2.8-0.9,5.6-1.8,8.4-2.7c0.2-0.1,0.3-0.2,0.3-0.4
-		c0-0.6,0-1.2,0-1.8c0-0.3-0.1-0.4-0.3-0.5c-1.2-0.4-2.3-0.8-3.5-1.2c-1.8-0.6-3.6-1.2-5.4-1.9c0.1,0,0.2-0.1,0.2-0.1
-		C32.3,39,33.2,38.9,34.2,38.8z"/>
-	<path class="st0" d="M28.6,33c1.9,0,3.8,0,5.7,0c1.9,0,3.8,0,5.6,0.1c0.1,0,0.2,0,0.3-0.1c0.1-0.1,0.1-0.2,0.1-0.3
-		c0-0.4,0-1.2,0-1.5c0,0,0-0.2,0-0.3c0,0-0.1-0.1-0.2-0.1c-1,0-2,0-3,0c-2.8,0-5.6-0.1-8.4-0.1c-0.3,0-0.4,0.1-0.3,0.4
-		c0,0.6,0,1.1,0,1.7C28.4,32.9,28.4,33,28.6,33z"/>
-	<path d="M86.1,15c-1.3-0.3-2.7-0.6-4-0.9c-0.2,0-0.3,0-0.3,0.2c-0.1,1.4-0.6,2.4-2,2.8c0.4,0.1,0.8,0.2,1.1,0.5
-		c1.5,1.1,1.5,3.8,0,5c-0.8,0.6-1.7,0.9-2.6,0.9c-1.3,0-2.7,0-4,0c-0.3,0-0.4-0.1-0.4-0.4c0.1-3.5,0.1-7,0.1-10.4
-		c0-0.3-0.1-0.4-0.3-0.4c-1-0.2-2-0.4-3-0.7c-0.3-0.1-0.3,0.1-0.3,0.3c0,3.3-0.1,6.5-0.1,9.8c0,0.5,0,1,0,1.6c0,0.2,0,0.2-0.2,0.2
-		c-0.6,0-1.2,0-1.8,0c-0.2,0-0.2,0-0.2-0.2c0-0.1,0-0.2,0-0.2c0-3.9,0.1-7.8,0.1-11.7c0-0.2,0-0.4-0.2-0.4c-1.6-0.4-3.2-0.7-4.8-1.1
-		c-3.2-0.7-6.5-1.4-9.7-2.2c-2.2-0.5-4.4-1-6.6-1.5c-2.9-0.7-5.8-1.3-8.8-2c-1.8-0.4-3.7-0.8-5.5-1.2c-0.2,0-0.3,0-0.3,0.2
-		c-0.2,1.2-0.5,2.5-0.7,3.7c-0.1,0.5-0.1,0.5,0.3,0.5c0.1,0,0.2,0,0.3,0.1c0.9,0.2,1.7,0.7,2,1.7c0,0.1,0,0.3,0.1,0.4
-		c0.1-0.3,0.2-0.5,0.3-0.8c0.8-1.8,3.1-2,4.4-1c0.9,0.7,1.3,1.7,1.4,2.9c0.1,1.6,0,3.1,0,4.7c0,0.3-0.1,0.4-0.4,0.4
-		c-3.3,0-6.6-0.1-9.9-0.1c-0.2,0-0.3,0.1-0.4,0.3c-0.1,0.5-0.2,1-0.3,1.5c-0.1,0.2,0,0.3,0.2,0.4c1.1,0.5,2.3,1,3.4,1.4
-		c2.3,1,4.7,2,7,2.9c0.2,0.1,0.3,0.2,0.2,0.4c0,0.5,0,1.1,0,1.6c0,0.2-0.1,0.3-0.2,0.4c-1.2,0.4-2.3,0.9-3.5,1.4
-		c-2.5,1-5,1.9-7.5,2.9c-0.2,0.1-0.3,0-0.4-0.2c-0.2-0.6-0.3-1.2-0.5-1.7c-0.1-0.2,0-0.3,0.2-0.4c2.3-0.8,4.6-1.6,7-2.4
-		c0.7-0.2,1.4-0.5,2.1-0.7c0-0.1-0.1-0.1-0.1-0.1c-2.8-1.1-5.5-2.1-8.2-3.2c-0.2-0.1-0.2,0-0.3,0.2c-0.5,2.4-1,4.8-1.5,7.3
-		c-0.7,3.3-1.3,6.6-2,9.8s-1.3,6.6-2,9.8c-0.7,3.3-1.3,6.6-2,9.9c-0.7,3.5-1.4,7-2.1,10.4c-0.6,3.2-1.3,6.3-1.9,9.5
-		c-0.7,3.5-1.4,7-2.1,10.5c-0.5,2.5-1,4.9-1.5,7.4c0,0.1-0.1,0.2,0,0.2c0.1,0,0.2,0,0.3,0c18.6,0,37.2,0,55.8,0c0.1,0,0.1,0,0.2,0
-		c0-0.1,0.1-0.2,0.1-0.3c0.4-2.1,0.8-4.3,1.3-6.4c0.8-4.2,1.7-8.4,2.6-12.7c0.9-4.4,1.8-8.9,2.7-13.3c0.8-3.7,1.5-7.5,2.3-11.2
-		c0.7-3.3,1.3-6.6,2-9.9c0.6-3.1,1.2-6.2,1.8-9.2c0.7-3.3,1.3-6.6,2-9.8c0.5-2.4,0.9-4.7,1.4-7.1C86.3,15.1,86.2,15,86.1,15z
-		 M28.7,30.6c2.8,0,5.6,0.1,8.4,0.1c1,0,2,0,3,0c0.1,0,0.2,0,0.2,0.1c0.1,0.1,0.1,0.2,0,0.3c0,0.3,0,1.1,0,1.5c0,0.1,0,0.2-0.1,0.3
-		C40.1,33,40,33,39.9,33c-1.9,0-3.8,0-5.6-0.1c-1.9,0-3.8,0-5.7,0c-0.2,0-0.2-0.1-0.2-0.3c0-0.6,0-1.1,0-1.7
-		C28.3,30.7,28.4,30.6,28.7,30.6z M36.5,41c1.2,0.4,2.3,0.8,3.5,1.2c0.2,0.1,0.3,0.2,0.3,0.5c0,0.6,0,1.2,0,1.8
-		c0,0.2-0.1,0.3-0.3,0.4c-2.8,0.9-5.6,1.8-8.4,2.7c-0.1,0-0.3,0.1-0.4,0.2c0.4,0,0.8,0.1,1.2,0.2c1.4,0.2,2.8,0.4,4.2,0.6
-		c1.2,0.2,2.4,0.3,3.5,0.5c0.5,0.1,0.5,0.1,0.4,0.5c-0.1,0.5-0.1,1-0.2,1.5c0,0.2-0.1,0.3-0.3,0.2c-3.5-0.7-7-1.3-10.5-2
-		c-0.3-0.1-0.7-0.1-1-0.2c-0.2,0-0.2-0.1-0.2-0.3c0-0.6,0-1.3,0-1.9c0-0.2,0.1-0.2,0.2-0.3c1.9-0.6,3.8-1.2,5.7-1.8
-		c1.2-0.4,2.4-0.8,3.6-1.2c-0.1-0.1-0.2-0.1-0.3-0.2c-3-1.1-6-2.2-9-3.3c-0.2-0.1-0.3-0.1-0.3-0.4c0-0.6,0-1.2,0-1.8
-		c0-0.2,0-0.2,0.2-0.2c1.1-0.2,2.2-0.3,3.3-0.5c1.5-0.2,3-0.5,4.5-0.7c1.2-0.2,2.5-0.4,3.7-0.6c0.2,0,0.2,0,0.3,0.2
-		c0,0.6,0.1,1.1,0.2,1.7c0,0.4,0,0.4-0.3,0.4c-1,0.1-2,0.2-3,0.3c-1,0.1-2,0.2-3,0.3c-1,0.1-1.9,0.2-2.9,0.3c0,0-0.1,0-0.2,0.1
-		C32.9,39.8,34.7,40.4,36.5,41z M56.5,11.9c-0.2,0.4-0.5,0.9-0.7,1.3c-0.1,0.2-0.2,0.2-0.3,0.1c-0.5-0.3-1-0.6-1.6-0.7
-		c-0.5-0.1-1-0.1-1.4,0.1c-1.2,0.5-1.4,1.9-0.4,2.8c0.5,0.4,1,0.6,1.6,0.9c0.4,0.2,0.8,0.4,1.2,0.6c2.2,1.4,2,4.3,0.5,5.7
-		c-0.8,0.8-1.8,1.1-2.9,1c-1,0-1.9-0.3-2.8-0.8c-0.2-0.1-0.3-0.2-0.2-0.5c0.2-0.4,0.4-0.8,0.6-1.2c0.1-0.2,0.2-0.3,0.4-0.1
-		c0.5,0.4,1.1,0.6,1.8,0.7c1,0.1,1.8-0.5,2-1.5c0.1-0.6-0.1-1.1-0.6-1.5c-0.5-0.4-1-0.6-1.5-0.8c-0.7-0.3-1.4-0.7-2-1.3
-		c-1.2-1.3-1.2-4.2,0.9-5.4c0.7-0.4,1.4-0.6,2.2-0.6c1.2,0,2.3,0.4,3.3,0.9C56.6,11.7,56.6,11.8,56.5,11.9z M66.5,12.6
-		c0,0.2-0.1,0.3-0.3,0.3c-0.9,0-1.8,0-2.7,0c-0.3,0-0.4,0.1-0.4,0.4c0,2.5,0,5,0,7.4c0,0.9,0,1.7,0,2.6c0,0.2-0.1,0.3-0.2,0.3
-		c-0.5,0-1.1,0-1.7,0c-0.2,0-0.3-0.1-0.3-0.3c0-1.7,0-3.3,0-5c0,0,0.1,0,0.1,0c0-1.7,0-3.3,0-5c0-0.3-0.1-0.3-0.3-0.3
-		c-0.9,0-1.8,0-2.8,0c-0.2,0-0.3,0-0.3-0.3c0-0.5,0-0.9,0-1.4c0-0.2,0-0.3,0.3-0.3c2.8,0,5.5,0,8.3,0c0.2,0,0.3,0.1,0.3,0.3
-		C66.5,11.6,66.5,12.1,66.5,12.6z"/>
-	<path d="M35.3,13.4c0.5,0,1,0,1.5,0c0,0,0,0,0,0c0.5,0,1,0,1.5,0c0.2,0,0.2,0,0.2-0.2c0-0.6,0-1.1,0-1.7c0-0.5-0.1-0.9-0.4-1.3
-		c-0.5-0.6-1.1-0.7-1.7-0.6c-0.7,0.1-1.1,0.7-1.3,1.4c-0.2,0.7-0.1,1.5-0.1,2.2C35.1,13.4,35.2,13.4,35.3,13.4z"/>
-	<path d="M76.1,19.9c0,0.5,0,1,0,1.6c0,0.2,0.1,0.3,0.2,0.3c0.6,0,1.2,0,1.8,0c0.4,0,0.8-0.2,1.2-0.5c0.5-0.4,0.6-1,0.5-1.7
-		c-0.1-0.7-0.5-1.2-1.2-1.4C77.8,17.9,77,18,76.3,18c-0.2,0-0.2,0.1-0.2,0.2C76.1,18.8,76.1,19.3,76.1,19.9
-		C76.1,19.9,76.1,19.9,76.1,19.9z"/>
-	<path d="M76.1,16c0,0.1,0,0.2,0.2,0.2c0.6,0,1.2,0,1.8-0.1c1-0.2,1.6-1,1.5-2.1c0-0.3-0.2-0.6-0.5-0.6c-0.9-0.2-1.8-0.4-2.7-0.6
-		c-0.2-0.1-0.3,0-0.3,0.2c0,0.5,0,1,0,1.4c0,0,0,0,0,0C76.1,15,76.1,15.5,76.1,16z"/>
-	<path d="M31.9,13.4c0.5,0,0.9,0,1.4,0c0.2,0,0.2,0,0.2-0.2c0-0.6,0-1.2-0.1-1.8c-0.2-1.3-1.1-2-2.2-1.7c-0.2,0.1-0.3,0.1-0.3,0.3
-		c-0.2,1-0.4,2-0.6,3.1c0,0.2,0,0.2,0.2,0.2C30.9,13.4,31.4,13.4,31.9,13.4z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-02.svg b/assets/walkbybrussels/icons_wbb-02.svg
deleted file mode 100644
index 56d7eb4fc9..0000000000
--- a/assets/walkbybrussels/icons_wbb-02.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st3" d="M72.79,34.66l-3.1,2.84c-0.25,0.23-0.6,0.16-0.78-0.07l-5.58-7.15c-0.09-0.12-0.14-0.27-0.13-0.42
-		c-0.01,0.15,0.04,0.31,0.13,0.42l5.58,7.15c0.18,0.23,0.52,0.3,0.78,0.07L72.79,34.66c0.24-0.22,0.24-0.6,0.06-0.83
-		C73.03,34.07,73.03,34.44,72.79,34.66z"/>
-	<path class="st3" d="M47.92,43.19C47.92,43.2,47.92,43.2,47.92,43.19l6.69,8.57c4.21-4.4,7.98-8.6,11.05-12.32
-		c-3.07,3.71-6.84,7.92-11.05,12.31L47.92,43.19z"/>
-	<path class="st3" d="M50.85,55.61c-0.56,0.56-1.13,1.14-1.7,1.7c-0.32,0.32-0.64,0.64-0.96,0.95c-1.26,1.24-2.54,2.49-3.84,3.74
-		c-1.29,1.24-2.59,2.48-3.9,3.69c-0.3,0.29-0.61,0.57-0.92,0.86c-0.68,0.64-1.37,1.27-2.05,1.89l0,0.01
-		c-8.62,7.19-17.24,14.39-25.86,21.58c0,0.01-0.01,0.01-0.01,0.01c-0.43,0.32-0.86,0.63-1.28,0.94c-1.55,0.77-4.15,0.96-5.6-0.8
-		c-0.05-0.07-0.1-0.13-0.15-0.2C4.23,89.49,4,88.96,3.86,88.4C4,88.97,4.23,89.51,4.58,90c0.05,0.07,0.1,0.14,0.15,0.2
-		c1.4,1.74,3.81,2.1,5.6,0.8c0.57-0.29,0.99-0.65,1.28-0.94c5.32-3.94,11.27-8.75,17.36-14.01l7.58-6.73
-		c0.31-0.28,0.62-0.56,0.93-0.85c0-0.02,0-0.02,0-0.02c0.68-0.62,1.37-1.25,2.05-1.89c0.31-0.28,0.61-0.57,0.92-0.85
-		c1.31-1.22,2.61-2.45,3.9-3.69c1.29-1.24,2.57-2.49,3.84-3.74c0.32-0.32,0.64-0.64,0.96-0.95c0.58-0.57,1.14-1.13,1.7-1.7
-		c0.36-0.37,0.72-0.73,1.08-1.09l-0.01-0.01C51.57,54.89,51.21,55.25,50.85,55.61z M4.73,90.19c1.45,1.77,4.05,1.58,5.6,0.8
-		C8.54,92.29,6.13,91.93,4.73,90.19z M36.55,69.31l-7.58,6.73c-6.08,5.27-12.04,10.07-17.36,14.01c0-0.01,0.01-0.01,0.01-0.01
-		c8.62-7.19,17.23-14.38,25.86-21.58C37.17,68.75,36.86,69.03,36.55,69.31z"/>
-	<path class="st3" d="M95.13,6.33c-6.07,0.59-10.41,1.65-13.37,2.76c-3.1,1.16-4.75,2.35-5.55,3.08c0.81-0.72,2.45-1.91,5.54-3.07
-		C84.71,7.98,89.06,6.93,95.13,6.33z"/>
-	<path class="st3" d="M87.49,26.75c-2.56,2.35-5.62,3.54-8.32,4.18C81.86,30.29,84.92,29.1,87.49,26.75
-		c1.58-1.44,5.57-6.32,8.83-20.55c0,0,0,0,0,0C93.05,20.43,89.06,25.31,87.49,26.75z"/>
-	<path class="st4" d="M99.16,3.59c-0.75-0.96-1.89-1.48-3.05-1.39c-6.05,0.5-17.01,2.07-22.35,6.96c-4.32,3.96-6.41,9.52-7.38,13.33
-		c-0.83,0.1-1.61,0.47-2.26,1.06l-3.1,2.84c-0.88,0.8-1.43,1.95-1.49,3.29c-8.09,6.36-16.19,12.71-24.29,19.07
-		C24.18,59.62,13.13,70.48,2.09,81.34c-0.54,0.64-1.48,1.94-1.9,3.86c-0.45,2.08-0.22,4.96,1.47,7.24c2.75,3.7,7.35,3.02,8,2.91
-		c2.1-0.35,3.46-1.43,5.24-2.83c6.62-5.23,10.11-7.99,10.15-7.97c0,0,0,0.01-0.01,0.01c3.36-3.13,8.16-7.45,14.92-13.13
-		c9.57-8.79,20.69-19.83,28.87-29.83c1.24,0.16,2.37-0.25,3.24-1.05l3.1-2.84c0.66-0.6,1.11-1.39,1.33-2.23
-		c3.63-0.41,9.04-1.71,13.36-5.67c5.34-4.9,8.59-16.34,10.04-22.72C100.19,5.86,99.91,4.56,99.16,3.59z M50.85,55.62
-		c-0.56,0.57-1.13,1.13-1.7,1.7c-0.32,0.32-0.64,0.64-0.96,0.95c-1.27,1.25-2.55,2.5-3.84,3.74c-1.29,1.24-2.59,2.47-3.9,3.69
-		c-0.31,0.29-0.61,0.57-0.92,0.85c-0.68,0.64-1.37,1.27-2.05,1.89c0,0,0,0,0,0.02c-0.31,0.29-0.62,0.57-0.93,0.85l-7.58,6.73
-		c-6.08,5.26-12.04,10.07-17.36,14.01c-0.29,0.29-0.71,0.65-1.28,0.94c-1.79,1.3-4.21,0.94-5.6-0.8c-0.05-0.07-0.1-0.13-0.15-0.2
-		C4.23,89.51,4,88.97,3.86,88.4c0.15,0.56,0.38,1.09,0.72,1.58c0.05,0.07,0.1,0.14,0.15,0.2c1.45,1.77,4.05,1.58,5.6,0.8
-		c0.42-0.31,0.85-0.62,1.28-0.94c0-0.01,0.01-0.01,0.01-0.01c8.62-7.19,17.24-14.39,25.86-21.58l0-0.01
-		c0.68-0.62,1.36-1.25,2.05-1.89c0.31-0.29,0.62-0.57,0.92-0.86c1.31-1.22,2.61-2.45,3.9-3.69c1.31-1.25,2.58-2.5,3.84-3.74
-		c0.32-0.32,0.64-0.64,0.96-0.95c0.57-0.57,1.14-1.14,1.7-1.7c0.36-0.36,0.72-0.72,1.07-1.08l0.01,0.01
-		C51.57,54.9,51.22,55.26,50.85,55.62z M54.61,51.76l-6.69-8.57c0,0,0,0,0,0L54.61,51.76c4.21-4.4,7.98-8.6,11.05-12.32
-		C62.59,43.16,58.82,47.36,54.61,51.76z M72.79,34.66l-3.1,2.84c-0.25,0.23-0.6,0.16-0.78-0.07l-5.58-7.15
-		c-0.09-0.12-0.14-0.27-0.13-0.42c-0.01,0.15,0.04,0.3,0.13,0.42l5.58,7.15c0.18,0.22,0.52,0.3,0.78,0.07L72.79,34.66
-		c0.24-0.22,0.24-0.59,0.06-0.83C73.04,34.07,73.04,34.44,72.79,34.66z M76.21,12.17c0.8-0.72,2.45-1.91,5.55-3.08
-		c2.96-1.11,7.3-2.17,13.37-2.76C89.06,6.93,84.71,7.98,81.75,9.1C78.66,10.26,77.02,11.44,76.21,12.17z M87.49,26.75
-		c-2.57,2.35-5.63,3.54-8.32,4.18C81.86,30.29,84.92,29.1,87.49,26.75c1.57-1.43,5.56-6.31,8.82-20.55c0,0,0,0,0,0
-		C93.06,20.43,89.06,25.31,87.49,26.75z"/>
-	<path class="st4" d="M11.61,90.05c5.32-3.94,11.27-8.74,17.36-14.01l7.58-6.73c0.31-0.28,0.62-0.56,0.93-0.85
-		c-8.62,7.19-17.24,14.39-25.86,21.58C11.62,90.04,11.62,90.05,11.61,90.05z"/>
-	<path class="st4" d="M4.73,90.19c1.4,1.74,3.81,2.1,5.6,0.8C8.78,91.76,6.19,91.95,4.73,90.19z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-03.svg b/assets/walkbybrussels/icons_wbb-03.svg
deleted file mode 100644
index 333d222a0b..0000000000
--- a/assets/walkbybrussels/icons_wbb-03.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st2" d="M50.8,0.5c-0.51-0.25-1.09-0.25-1.6,0L0.15,24.65h99.7L50.8,0.5z"/>
-	<path class="st2" d="M0.15,30.26c0,2.51,1.79,4.55,4.01,4.55h8.62v64.66h10.63V34.81h21.2v64.88H50h5.38V34.81h21.06v64.66h10.63
-		V34.81h8.76c2.22,0,4.01-2.04,4.01-4.55v-5.61H0.15V30.26z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-04.svg b/assets/walkbybrussels/icons_wbb-04.svg
deleted file mode 100644
index a0f490e495..0000000000
--- a/assets/walkbybrussels/icons_wbb-04.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st3" d="M32.95,71.53c-3.34-2.49-7.11-3.48-11.15-3.45c-4.58,0.04-8.73,1.39-12.22,4.6
-		c-4.08,3.74-4.17,8.97-0.23,12.86c3.49,3.44,7.79,4.62,11.68,4.69c4.81,0,8.58-0.96,11.92-3.46
-		C38.64,82.52,38.64,75.77,32.95,71.53z"/>
-	<path class="st3" d="M50.05,61.82c-1.62-0.03-2.92,1.24-2.96,2.91c-0.04,1.62,1.25,3.01,2.84,3.03c1.61,0.01,2.91-1.31,2.92-2.95
-		C52.87,63.2,51.6,61.86,50.05,61.82z"/>
-	<path class="st3" d="M89.27,71.73c-3.31-2.49-7.05-3.62-11.1-3.64c-4.04-0.02-7.81,0.96-11.15,3.44c-5.7,4.25-5.7,10.98-0.02,15.23
-		c3.31,2.49,7.05,3.46,9.56,3.47c5.5,0.01,9.25-0.94,12.57-3.38C94.9,82.63,94.96,76.03,89.27,71.73z"/>
-	<path class="st7" d="M99.31,77.82c-1.16-4.74-2.28-9.49-3.45-14.2c-3.35-13.31-6.74-26.61-10.09-39.92
-		c-0.71-2.77-2.04-5.05-4.19-6.83c-0.32-0.27-0.59-0.72-0.68-1.14c-0.74-3.27-2.72-5.5-5.54-6.81c-4.58-2.12-9.1-1.88-13.4,0.95
-		c-2.69,1.77-4.94,5.55-3.76,9.67c0.08,0.3,0.09,0.71-0.04,0.96c-1.17,2.13-1.32,4.47-1.22,6.84c0.01,0.42,0,0.85,0,1.39
-		c-4.65-1.81-9.23-1.85-13.88,0.01c0-1.13-0.02-2.12,0-3.13c0.03-1.72-0.38-3.32-1.11-4.85c-0.17-0.35-0.26-0.86-0.16-1.23
-		c1.15-4.08-0.97-7.85-3.69-9.62C33.13,6.7,28.05,6.66,23.05,9.86c-2.04,1.32-3.35,3.28-3.94,5.76c-0.12,0.48-0.42,0.98-0.78,1.29
-		c-2.11,1.78-3.42,4.03-4.11,6.77C9.93,40.69,5.67,57.7,1.29,74.69c-2.11,8.19,1.54,14.55,7.59,18.04
-		c9.17,5.3,18.43,5.07,27.31-0.93c3.71-2.51,6.13-6.13,6.73-10.82c0.22-1.69,0.12-3.44,0.13-5.15c0.01-1.75,0-3.5,0-5.49
-		c1.91,2.32,4.16,3.56,6.88,3.57c2.75,0.02,5.03-1.18,6.91-3.49c0.04,0.36,0.08,0.6,0.08,0.84c0,2.32,0.05,4.65-0.01,6.97
-		c-0.17,5.89,2.38,10.31,6.83,13.57c8.31,6.09,20.19,6.13,28.55,0.15c3.6-2.57,6.12-5.99,6.86-10.64c0.01-0.09,0.1-0.15,0.16-0.23
-		V77.82z M32.95,86.76c-3.34,2.5-7.11,3.46-11.92,3.46c-3.89-0.07-8.19-1.25-11.68-4.69c-3.94-3.88-3.84-9.12,0.23-12.86
-		c3.49-3.21,7.64-4.56,12.22-4.6c4.04-0.04,7.81,0.96,11.15,3.45C38.64,75.77,38.64,82.52,32.95,86.76z M49.94,67.76
-		c-1.59-0.02-2.89-1.4-2.84-3.03c0.04-1.67,1.34-2.94,2.96-2.91c1.55,0.03,2.81,1.38,2.8,2.99C52.84,66.45,51.55,67.77,49.94,67.76z
-		 M89.14,86.84c-3.33,2.45-7.08,3.4-12.57,3.38c-2.52-0.01-6.26-0.98-9.56-3.47c-5.68-4.25-5.68-10.98,0.02-15.23
-		c3.34-2.48,7.11-3.46,11.15-3.44c4.05,0.02,7.79,1.15,11.1,3.64C94.96,76.03,94.9,82.63,89.14,86.84z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-05.svg b/assets/walkbybrussels/icons_wbb-05.svg
deleted file mode 100644
index 2d2d57d82f..0000000000
--- a/assets/walkbybrussels/icons_wbb-05.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<path class="st1" d="M86.8,75.14c0.01,0,0.02,0,0.03-0.01c1.74-0.37,3.27-0.98,4.62-1.78c2.96-1.77,5.01-4.52,6.31-8.04c0,0,0,0,0,0
-	s0.15-0.43,0.29-0.9c0.51-1.75,0.67-2.76,0.67-2.76c0.28-1.71,0.03-3.45-0.18-4.5c-0.01-0.05-0.02-0.11-0.03-0.19
-	c-0.01-0.06-0.02-0.12-0.03-0.19c-0.04-0.19-0.08-0.41-0.12-0.64c-0.02-0.08-0.03-0.15-0.05-0.24c-0.02-0.08-0.04-0.16-0.06-0.25
-	c-0.01-0.03-0.01-0.05-0.02-0.08c-0.02-0.06-0.03-0.12-0.05-0.18c-0.02-0.09-0.05-0.18-0.07-0.27c-0.04-0.14-0.08-0.29-0.12-0.43
-	c0-0.02-0.01-0.03-0.01-0.04c-0.49-1.64-1.36-3.68-3.02-5.6c-0.01-0.01-0.02-0.02-0.03-0.03c-0.12-0.13-0.24-0.26-0.36-0.4
-	c-0.02-0.02-0.04-0.04-0.06-0.06c-0.07-0.08-0.14-0.15-0.21-0.23c-0.02-0.02-0.05-0.05-0.07-0.07c-0.06-0.06-0.12-0.12-0.19-0.18
-	c-0.07-0.07-0.15-0.14-0.22-0.21c-0.06-0.06-0.13-0.12-0.19-0.17c-0.08-0.07-0.15-0.13-0.23-0.2c-0.07-0.06-0.14-0.12-0.2-0.17
-	c-0.08-0.07-0.16-0.13-0.23-0.19c-0.07-0.05-0.14-0.11-0.21-0.16c-0.08-0.06-0.16-0.12-0.24-0.18c-0.07-0.05-0.14-0.1-0.22-0.15
-	c-0.08-0.06-0.17-0.12-0.25-0.17c-0.07-0.05-0.15-0.1-0.22-0.15c-0.09-0.05-0.17-0.11-0.26-0.16c-0.08-0.04-0.15-0.09-0.23-0.14
-	c-0.09-0.05-0.18-0.1-0.27-0.15c-0.08-0.05-0.15-0.09-0.23-0.14c-0.09-0.05-0.19-0.1-0.28-0.15c-0.08-0.04-0.16-0.08-0.24-0.13
-	c-0.09-0.05-0.19-0.09-0.29-0.14c-0.08-0.03-0.16-0.08-0.24-0.11c-0.1-0.04-0.2-0.09-0.3-0.13c-0.08-0.03-0.17-0.07-0.25-0.11
-	c-0.1-0.04-0.21-0.08-0.32-0.13c-0.08-0.03-0.17-0.07-0.25-0.1c-0.11-0.04-0.22-0.07-0.33-0.12c-0.08-0.03-0.16-0.06-0.25-0.08
-	c-0.12-0.04-0.24-0.08-0.36-0.11c-0.08-0.02-0.16-0.05-0.24-0.07c-0.13-0.04-0.27-0.08-0.4-0.11c-0.07-0.02-0.13-0.03-0.2-0.05
-	c-0.2-0.05-0.41-0.1-0.61-0.15c0,0-0.01,0-0.01,0c0.04-0.07,0.09-0.14,0.14-0.2c0.14-0.19,0.27-0.38,0.36-0.58
-	c0.35-0.8,0.71-1.6,1.06-2.41c0.26-0.59,0.5-1.19,0.73-1.79c0,0,0,0,0,0c0.12-0.29,0.26-0.69,0.38-1.19
-	c0.31-1.33,0.19-2.39,0.07-3.3c-0.11-0.87-0.35-2.1-0.91-3.49l-0.1-0.23v0c-0.03-0.06-0.05-0.13-0.08-0.19
-	c-0.17-0.38-0.36-0.75-0.56-1.1c-0.6-1.06-1.32-2.01-2.16-2.84c-0.28-0.28-0.58-0.54-0.88-0.79c-0.52-0.43-1.09-0.82-1.68-1.17
-	c-0.2-0.12-0.41-0.23-0.62-0.35c-0.27-0.14-0.54-0.28-0.82-0.41c-0.21-0.1-0.39-0.18-0.51-0.31c-0.07-0.08-0.13-0.18-0.15-0.31
-	c-0.02-0.08-0.03-0.18-0.02-0.29c0.07-1.55-0.17-2.98-0.71-4.23c-0.19-0.43-0.4-0.83-0.66-1.22c-0.45-0.67-1.01-1.27-1.69-1.8
-	c-0.51-0.4-1.08-0.74-1.72-1.05c-0.22-0.1-0.42-0.21-0.6-0.32c-0.27-0.16-0.51-0.33-0.71-0.51c-0.2-0.18-0.37-0.38-0.52-0.59
-	c-0.39-0.56-0.6-1.24-0.76-2.11c-0.13-0.73-0.33-1.42-0.59-2.08c-0.2-0.5-0.43-0.97-0.7-1.43C71.4,7,70.86,6.3,70.24,5.66
-	c-0.09-0.09-0.19-0.19-0.28-0.28c-0.29-0.28-0.59-0.54-0.9-0.78c-0.42-0.33-0.87-0.63-1.33-0.9c-0.31-0.18-0.63-0.35-0.96-0.51
-	c-0.98-0.46-2.04-0.81-3.13-1.02c-0.37-0.07-0.74-0.12-1.11-0.16c-0.75-0.08-1.52-0.08-2.29-0.02c-0.54,0.04-1.07,0.13-1.6,0.24
-	c-0.35,0.08-0.69,0.17-1.03,0.28c-0.17,0.05-0.33,0.11-0.5,0.18c-0.33,0.13-0.66,0.27-0.97,0.42c-0.95,0.46-1.84,1.05-2.63,1.74
-	c-0.26,0.23-0.52,0.47-0.77,0.72c-1.96,2.01-3.22,4.67-3.32,7.52c-0.01,0.21-0.04,0.37-0.1,0.51c-0.04,0.09-0.1,0.16-0.18,0.23
-	c-0.11,0.1-0.26,0.17-0.47,0.24c-3.15,1.03-5.33,3.32-6.06,6.24c-0.06,0.23-0.11,0.47-0.15,0.71c-0.06,0.36-0.1,0.73-0.11,1.11
-	c-0.01,0.13-0.01,0.25-0.01,0.38s0,0.25,0.01,0.38c0,0.04,0,0.08,0,0.12c0,0.34-0.06,0.58-0.2,0.75c-0.12,0.14-0.3,0.24-0.56,0.28
-	c-0.09,0.02-0.18,0.03-0.28,0.03c-0.02-0.06-0.05-0.12-0.07-0.19c-0.06-0.17-0.12-0.34-0.19-0.5c-0.03-0.06-0.05-0.12-0.07-0.18
-	c-0.83-1.94-1.62-3.9-2.45-5.84c-0.5-1.16-1.02-2.32-1.57-3.46c-0.45-0.91-0.92-1.81-1.42-2.68c-0.38-0.66-0.78-1.3-1.2-1.92
-	c-0.56-0.84-1.17-1.64-1.84-2.4c-0.33-0.38-0.68-0.76-1.04-1.12c-0.54-0.54-1.12-1.06-1.73-1.55c-0.15-0.12-0.3-0.23-0.45-0.34
-	c-0.13-0.1-0.27-0.19-0.41-0.29c-0.67-0.45-1.34-0.81-2.02-1.08c-0.37-0.14-0.73-0.26-1.1-0.35c-0.24-0.06-0.49-0.11-0.74-0.15
-	c-0.37-0.06-0.74-0.08-1.1-0.09c-0.86-0.01-1.72,0.13-2.57,0.41c-1.09,0.36-2.17,0.97-3.22,1.82c-0.97,0.79-1.85,1.64-2.65,2.53
-	c-0.4,0.45-0.78,0.91-1.15,1.38c-0.24,0.31-0.48,0.63-0.71,0.95c-0.11,0.16-0.23,0.32-0.34,0.49c-0.45,0.65-0.86,1.32-1.26,2
-	c-0.9,1.54-1.68,3.14-2.41,4.77c-0.16,0.36-0.33,0.73-0.48,1.09c-0.4,0.92-0.78,1.84-1.16,2.76c-0.01,0.01-0.01,0.02-0.01,0.03
-	C7.52,21.1,7.1,22.11,6.71,23.2c-0.36,0.99-0.65,1.94-0.9,2.83c-0.06,0.13-0.11,0.27-0.15,0.41c-0.76,3.07-1.58,6.14-2.33,9.21
-	c-0.45,1.84-0.88,3.7-1.26,5.55c-0.95,4.62-1.34,9.33-0.24,14.01c0.38,1.64,0.88,3.19,1.5,4.66c0.09,0.21,0.18,0.42,0.27,0.62
-	c0.28,0.62,0.58,1.22,0.9,1.81c0.32,0.59,0.67,1.16,1.04,1.71c0.9,1.35,1.94,2.6,3.12,3.74c0.27,0.26,0.55,0.52,0.84,0.77
-	c1.54,1.34,3.3,2.52,5.3,3.53c0.3,0.15,0.59,0.29,0.89,0.42c0.6,0.26,1.21,0.48,1.84,0.68s1.25,0.36,1.89,0.5
-	c0.69,0.15,1.39,0.26,2.1,0.35v20.3H1.16v4.9h97.56v-4.9H86.8V75.14z M8.39,27.43c0.02-0.07,0.04-0.13,0.05-0.2l0,0
-	C8.43,27.3,8.41,27.37,8.39,27.43z M69.97,57.4c0,0.93-0.06,2.03,0.01,3.12c0.32,5.2,2.46,9.47,6.85,12.55
-	c1.52,1.07,3.22,1.75,5.06,2.07v19.17c-5.99,0-11.95,0-17.97,0V55.66c0.77,0.36,1.53,0.71,2.33,0.96
-	C67.36,56.97,68.53,57.11,69.97,57.4z M39,67.83c3.73-3.64,5.97-8.06,7.05-13.14c4.23,3.17,8.52,3.2,12.98,0.91v38.7H26.41V73.98
-	C31.27,73.32,35.48,71.27,39,67.83z"/>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-06.svg b/assets/walkbybrussels/icons_wbb-06.svg
deleted file mode 100644
index ad76c80ee6..0000000000
--- a/assets/walkbybrussels/icons_wbb-06.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<path class="st1" d="M77.22,32.79c2.42-8.74-3.23-17.77-12.07-19.42c-1.33-7.25-7.64-12.75-15.2-12.75c-7.56,0-13.86,5.5-15.2,12.75
-	c-7.17,1.34-12.63,7.71-12.63,15.35c0,1.37,0.19,2.74,0.56,4.08c-7.62,2.43-12.93,9.55-12.93,17.77c0,10.33,8.32,18.73,18.55,18.73
-	c3.69,0,7.2-1.15,10.29-3.33c1.96,1.24,4.09,2.04,6.28,2.59v29.93h4.4v0h5.73v0V68.55c2.19-0.55,4.33-1.34,6.29-2.59
-	c3.09,2.19,6.61,3.33,10.29,3.33c10.23,0,18.55-8.4,18.55-18.73C90.15,42.36,84.85,35.23,77.22,32.79z M59.23,16.22
-	c0,1.73,1.39,3.12,3.09,3.12c7.02,0,11.72,7.74,7.93,14.14c-0.88,1.48-0.38,3.28,0.89,4.17c-1.27-0.89-1.77-2.69-0.89-4.17
-	c3.79-6.41-0.91-14.14-7.93-14.14C60.61,19.35,59.22,17.95,59.23,16.22c-0.01-5.16-4.16-9.36-9.28-9.36c0,0,0,0,0,0
-	C55.07,6.86,59.23,11.06,59.23,16.22z M41.58,26.5c-1.21,1.22-1.21,3.2,0,4.42l1.58,1.6l-1.59-1.6
-	C40.37,29.7,40.37,27.72,41.58,26.5c1.2-1.22,3.16-1.22,4.37,0l0,0C44.74,25.29,42.79,25.29,41.58,26.5z M60.14,39l-5.12,5.17v-0.01
-	L60.14,39c0.9-0.92,2.23-1.14,3.35-0.69C62.37,37.86,61.04,38.08,60.14,39z M53.95,26.51l-4,4.04l-0.01-0.01L53.95,26.51
-	c0.9-0.92,2.23-1.14,3.34-0.69C56.18,25.37,54.85,25.6,53.95,26.51z M44.88,44.15L44.88,44.15l-5.11-5.16
-	c-1.21-1.22-3.17-1.22-4.37,0c-0.91,0.91-1.13,2.25-0.68,3.38c-0.46-1.13-0.23-2.47,0.68-3.38c1.21-1.22,3.16-1.22,4.37,0
-	L44.88,44.15z M44.88,52.97L44.88,52.97l-6.57-6.62L44.88,52.97z M44.73,61.99c-0.41-0.15-0.83-0.23-1.23-0.42
-	C43.9,61.75,44.32,61.83,44.73,61.99z M46.85,41.05v-4.81l0.01,0.01L46.85,41.05L46.85,41.05z M37.58,19.34
-	c0.85,0,1.62-0.35,2.18-0.91C39.21,19,38.43,19.35,37.58,19.34c-1.28,0-2.5,0.27-3.61,0.74C35.08,19.61,36.3,19.34,37.58,19.34z
-	 M28.31,63.04C28.31,63.04,28.31,63.04,28.31,63.04c3.71,0,6.45-1.79,8.11-3.3c0.36-0.33,0.78-0.52,1.22-0.64
-	c-0.44,0.13-0.86,0.32-1.22,0.64C34.77,61.25,32.02,63.04,28.31,63.04z M59.5,59.63c-1.38,1.1-2.91,1.85-4.48,2.42v-0.01
-	c1.57-0.57,3.1-1.32,4.47-2.42c1.02-0.82,2.39-0.85,3.48-0.2C61.88,58.79,60.52,58.81,59.5,59.63z M71.6,63.05
-	c-1.85,0-3.47-0.45-4.83-1.09C68.13,62.6,69.74,63.05,71.6,63.05c6.81,0,12.36-5.6,12.36-12.49c0-6.5-4.87-11.81-11.32-12.37
-	c-0.22-0.02-0.37-0.15-0.57-0.21c0.2,0.06,0.36,0.19,0.57,0.21c6.46,0.55,11.32,5.87,11.32,12.36
-	C83.96,57.45,78.42,63.05,71.6,63.05z"/>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-07.svg b/assets/walkbybrussels/icons_wbb-07.svg
deleted file mode 100644
index 6ffdd62a4b..0000000000
--- a/assets/walkbybrussels/icons_wbb-07.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st0" d="M39.12,91.59c1.19-1.21,2.14-2.6,2.82-4.12c0.32-0.8,0.56-1.63,0.69-2.51c-0.78-0.07-1.56-0.15-2.32-0.24
-		c-5.44-0.59-10.78-1.79-15.92-3.56c-6.62-2.2-12.28-5.09-16.59-8.17c4.87,9.2,12.6,16.56,22.03,20.97c0.02,0,0.04,0,0.07,0.01
-		c0.02,0,0.05,0,0.07,0.01C33.2,94.38,36.47,93.53,39.12,91.59C39.12,91.59,39.12,91.59,39.12,91.59z"/>
-	<path class="st0" d="M11.36,23.64c0.02,3.82,7.1,11.91,13.94,19.75c10.48,11.99,22.36,25.6,22.36,36.95
-		c0.01,0.14,0.02,0.26,0.03,0.4c2.98,0.1,5.97,0.02,8.95-0.25C56.11,34.35,52.97,24.9,41.15,4.33c-0.05-0.09-0.09-0.17-0.13-0.26
-		c-11.98,2.3-22.62,9.1-29.73,19.01c0.04,0.18,0.07,0.36,0.07,0.54C11.36,23.63,11.36,23.64,11.36,23.64z"/>
-	<path class="st0" d="M88.65,23.17c0.79,9.29-3.05,18.48-6.79,27.46c-3.93,7.87-6.29,16.42-6.97,25.18c0,0.05,0,0.1,0,0.15
-		c7.36-3.19,14.09-7.87,19.71-13.84c0.72-0.78,1.42-1.58,2.1-2.4C99.18,46.95,96.27,33.73,88.65,23.17z"/>
-	<path class="st0" d="M12.01,70.35c0.05,0.03,0.1,0.07,0.16,0.1c7.44,4.72,18.65,8.83,30.95,9.98v-0.1
-		c0-9.66-11.78-23.14-21.24-33.96c-3.04-3.13-5.86-6.46-8.45-9.98c-2.39-3.02-4.27-5.75-5.41-8.2c-1.41,2.59-2.56,5.29-3.46,8.05
-		c-0.03,0.1-0.06,0.19-0.09,0.28c-0.06,0.18-0.11,0.36-0.16,0.53c-0.07,0.22-0.13,0.43-0.2,0.65c-0.02,0.09-0.05,0.18-0.07,0.26
-		c-0.09,0.31-0.17,0.63-0.25,0.94c0,0.01,0,0.03-0.01,0.05c-0.98,3.79-1.49,7.76-1.49,11.86c0,0.18,0,0.36,0.01,0.53
-		c0,0.16,0,0.33,0,0.49c0.09,3.68,0.61,7.37,1.57,10.98c0.12,0.12,0.23,0.25,0.33,0.4c1.47,2.31,4.12,4.73,7.65,7.02
-		C11.9,70.29,11.96,70.31,12.01,70.35z"/>
-	<path class="st0" d="M70.34,76.33c0-0.17-0.01-0.35-0.01-0.53c0.64-9.37,3.13-18.52,7.32-26.93c4.84-11.59,9.39-22.53,4.31-33.17
-		C73.51,7.92,62.52,3.5,51.06,3.22C50.68,3.21,50.3,3.2,49.92,3.2c0,0,0,0,0,0c-1.36,0-2.71,0.09-4.07,0.21
-		c12.1,21.31,14.86,32.77,15.33,76.49c3.13-0.5,6.21-1.25,9.22-2.23C70.37,77.24,70.35,76.79,70.34,76.33z"/>
-	<path class="st0" d="M56.69,85.18c-3.08,0.27-6.19,0.33-9.32,0.15c-0.21,1.08-0.52,2.13-0.92,3.15c-0.88,2.47-2.35,4.7-4.31,6.48
-		c-0.03,0.03-0.06,0.06-0.09,0.09c-0.02,0.01-0.03,0.02-0.05,0.04c-0.99,0.82-2.1,1.49-3.28,2c3.67,0.91,7.44,1.38,11.21,1.39
-		c2.28-0.02,4.56-0.2,6.81-0.54c0-0.05,0-0.11,0-0.17c0-4.2-0.01-8.17-0.04-11.9C56.69,85.64,56.69,85.41,56.69,85.18z"/>
-	<path class="st0" d="M75.73,81.51c0.31,0.89,0.69,1.62,1.1,2.26c0.99,1.43,2.41,2.55,4.11,3.15c5.65-4.85,10.08-10.95,12.96-17.81
-		c-5.47,4.87-11.7,8.74-18.38,11.48C75.56,80.91,75.64,81.22,75.73,81.51z"/>
-	<path class="st0" d="M72.37,85.09c-0.25-0.45-0.47-0.92-0.66-1.4c-0.19-0.47-0.36-0.96-0.52-1.49c-3.24,1.07-6.57,1.88-9.96,2.43
-		c0.03,3.9,0.04,8.03,0.05,12.44c5.62-1.37,10.94-3.75,15.7-7.04C75.37,89.05,73.65,87.5,72.37,85.09z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-08.svg b/assets/walkbybrussels/icons_wbb-08.svg
deleted file mode 100644
index a9fa403013..0000000000
--- a/assets/walkbybrussels/icons_wbb-08.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<path class="st0" d="M82.32,63.43c-0.12-3.75-1.24-7.25-2.56-10.7c-2.67-6.96-6.26-13.44-10.19-19.72
-	c-5.29-8.43-10.79-16.72-16.18-25.09c-0.66-1.03-1.39-1.97-2.5-2.5c-0.53,0-1.05,0-1.58,0c-1.15,0.43-1.92,1.27-2.54,2.33
-	c-0.73,1.25-1.54,2.46-2.34,3.67c-6.27,9.38-12.57,18.74-18.05,28.63c-2.8,5.05-5.37,10.23-7.16,15.77
-	c-0.9,2.78-1.57,5.61-1.54,8.56c0.04,5.18,1.21,10.08,3.52,14.7c3.12,6.22,7.73,10.95,13.77,14.19c6.18,3.31,12.75,4.47,19.69,3.46
-	c4.97-0.73,9.52-2.55,13.63-5.47c5.98-4.25,10.19-9.92,12.5-17C81.91,70.73,82.44,67.12,82.32,63.43z M49.73,14.85
-	c0.06-0.1,0.14-0.18,0.31-0.4c0,0.01,0.01,0.01,0.01,0.02c-0.16,0.2-0.24,0.29-0.3,0.38c-3.67,5.75-7.37,11.47-11.03,17.23
-	C42.39,26.33,46.07,20.6,49.73,14.85z M34.56,85.37c-5.13-3.8-8.33-8.9-9.83-15.16c-1.08-4.56-0.81-9.02,0.78-13.42
-	c2.2-6.1,5.13-11.82,8.52-17.28c1.02-1.64,2.07-3.27,3.11-4.91c-1.03,1.63-2.07,3.27-3.09,4.91c-3.4,5.46-6.32,11.19-8.52,17.28
-	c-1.59,4.41-1.86,8.87-0.78,13.42c1.5,6.26,4.7,11.37,9.83,15.17c4.39,3.25,9.23,4.97,14.54,5.14
-	C43.8,90.34,38.96,88.63,34.56,85.37z"/>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-09.svg b/assets/walkbybrussels/icons_wbb-09.svg
deleted file mode 100644
index ae5f0fb6eb..0000000000
--- a/assets/walkbybrussels/icons_wbb-09.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<rect x="1.09" y="60.2" class="st0" width="97.83" height="11"/>
-	<rect x="9.19" y="28.95" class="st0" width="79.83" height="11"/>
-	<rect x="9.33" y="14.97" class="st0" width="79.83" height="11"/>
-	<path class="st0" d="M93.81,51.37c-29.59-0.01-59.17-0.01-88.76-0.02c-0.94,2.09-1.87,4.17-2.8,6.25c31.73,0,63.46,0,95.2,0
-		C96.24,55.53,95.02,53.45,93.81,51.37z"/>
-	<path class="st0" d="M8.91,42.94c-0.95,2.07-1.89,4.14-2.83,6.21c28.79-0.05,57.58-0.1,86.36-0.16c-1.16-2-2.32-4.01-3.47-6.01
-		C62.28,42.97,35.59,42.95,8.91,42.94z"/>
-	<rect x="10.06" y="73.22" class="st0" width="5.52" height="21.23"/>
-	<rect x="81.95" y="73.22" class="st0" width="5.52" height="21.23"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-10.svg b/assets/walkbybrussels/icons_wbb-10.svg
deleted file mode 100644
index 8eba3245e2..0000000000
--- a/assets/walkbybrussels/icons_wbb-10.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<defs>
-		<rect id="SVGID_1_" x="14.46" y="-2.46" width="75.68" height="107.61"/>
-	</defs>
-	<clipPath id="SVGID_2_">
-		<use xlink:href="#SVGID_1_"  style="overflow:visible;"/>
-	</clipPath>
-	<g class="st8">
-		<path class="st0" d="M16.13,96.56c-0.13-0.06-0.05-0.14-0.03-0.22c0.5-2.47,0.99-4.95,1.49-7.42c0.71-3.5,1.41-7.01,2.12-10.52
-			c0.64-3.17,1.29-6.34,1.93-9.51c0.7-3.47,1.4-6.95,2.1-10.42c0.66-3.29,1.33-6.58,1.99-9.87c0.66-3.28,1.32-6.56,1.98-9.84
-			c0.66-3.28,1.32-6.56,1.98-9.84c0.49-2.42,0.99-4.84,1.46-7.26c0.04-0.21,0.09-0.24,0.28-0.17c2.75,1.07,5.49,2.13,8.24,3.19
-			c0.05,0.02,0.1,0.04,0.13,0.12c-0.71,0.25-1.43,0.49-2.14,0.73c-2.32,0.8-4.63,1.59-6.95,2.38c-0.22,0.07-0.27,0.15-0.19,0.39
-			c0.19,0.57,0.36,1.15,0.52,1.73c0.06,0.24,0.14,0.3,0.38,0.2c2.48-0.98,4.97-1.96,7.46-2.93c1.16-0.45,2.31-0.91,3.47-1.35
-			c0.19-0.07,0.26-0.16,0.25-0.38c-0.02-0.54-0.02-1.08,0-1.62c0.01-0.21-0.08-0.31-0.25-0.38c-2.34-0.98-4.69-1.95-7.03-2.93
-			c-1.14-0.47-2.28-0.95-3.41-1.42c-0.17-0.07-0.24-0.13-0.19-0.36c0.12-0.5,0.2-1.01,0.28-1.52c0.03-0.22,0.13-0.29,0.35-0.29
-			c3.29,0.04,6.57,0.06,9.86,0.1c0.32,0,0.4-0.08,0.4-0.42c-0.02-1.55,0.02-3.11-0.04-4.67c-0.04-1.16-0.46-2.17-1.39-2.87
-			c-1.28-0.96-3.6-0.78-4.36,1.02c-0.11,0.25-0.17,0.52-0.26,0.78c-0.09-0.13-0.08-0.28-0.13-0.42C36.1,9.58,35.38,9.1,34.45,8.9
-			c-0.09-0.02-0.19-0.03-0.28-0.05c-0.42-0.08-0.42-0.08-0.33-0.54c0.25-1.23,0.49-2.45,0.72-3.68c0.04-0.23,0.09-0.3,0.34-0.25
-			c1.85,0.43,3.7,0.83,5.54,1.24c2.92,0.65,5.84,1.3,8.77,1.96c2.2,0.49,4.39,0.99,6.59,1.48c3.23,0.72,6.46,1.44,9.68,2.17
-			c1.6,0.36,3.21,0.72,4.81,1.07c0.24,0.05,0.25,0.21,0.24,0.4c-0.04,3.89-0.08,7.78-0.12,11.67c0,0.08,0.01,0.16,0,0.23
-			c-0.02,0.18,0.06,0.22,0.22,0.22c0.59-0.01,1.18-0.01,1.76,0c0.19,0,0.23-0.07,0.23-0.25c-0.01-0.52,0-1.04,0-1.56
-			c0.02-3.27,0.05-6.54,0.07-9.81c0-0.25,0.03-0.38,0.31-0.31c0.99,0.23,1.98,0.45,2.97,0.66c0.23,0.05,0.31,0.14,0.31,0.41
-			c-0.05,3.48-0.08,6.96-0.14,10.44c-0.01,0.36,0.1,0.43,0.41,0.42c1.32-0.02,2.65,0,3.97-0.01c0.95-0.01,1.85-0.23,2.62-0.86
-			c1.51-1.23,1.51-3.89-0.01-5.01c-0.33-0.25-0.72-0.38-1.12-0.48c1.37-0.4,1.93-1.42,2.01-2.81c0.02-0.25,0.1-0.27,0.29-0.23
-			c1.35,0.31,2.7,0.62,4.04,0.92c0.18,0.04,0.25,0.08,0.21,0.32c-0.49,2.36-0.95,4.73-1.43,7.09c-0.66,3.28-1.32,6.56-1.98,9.84
-			c-0.62,3.07-1.23,6.15-1.85,9.23c-0.66,3.29-1.33,6.58-1.99,9.86c-0.75,3.73-1.51,7.46-2.26,11.19
-			c-0.89,4.44-1.77,8.88-2.67,13.33c-0.85,4.22-1.71,8.45-2.56,12.67c-0.43,2.14-0.85,4.28-1.28,6.42
-			c-0.02,0.09-0.05,0.17-0.07,0.26c-0.05,0-0.11,0-0.16,0c-18.62,0-37.24,0-55.85,0C16.36,96.55,16.24,96.56,16.13,96.56z
-			 M33.38,40.48c0.13-0.04,0.18-0.06,0.24-0.07c0.96-0.1,1.92-0.19,2.88-0.29c0.99-0.1,1.98-0.2,2.97-0.3c1-0.1,2-0.21,3-0.3
-			c0.38-0.04,0.39-0.04,0.35-0.43c-0.06-0.56-0.13-1.11-0.17-1.67c-0.02-0.21-0.07-0.27-0.27-0.24c-1.24,0.2-2.48,0.38-3.73,0.57
-			c-1.51,0.23-3.02,0.47-4.53,0.71c-1.08,0.17-2.17,0.35-3.26,0.51c-0.17,0.02-0.2,0.09-0.2,0.25c0.01,0.62,0.02,1.24,0,1.85
-			c-0.01,0.25,0.09,0.31,0.28,0.38c3,1.09,6,2.19,8.99,3.29c0.09,0.03,0.2,0.03,0.26,0.17c-1.23,0.39-2.43,0.78-3.64,1.17
-			c-1.89,0.6-3.78,1.2-5.67,1.81c-0.14,0.04-0.22,0.11-0.22,0.3c0.01,0.64,0.01,1.28,0,1.92c0,0.17,0.05,0.24,0.2,0.25
-			c0.34,0.05,0.68,0.11,1.02,0.17c3.5,0.66,7,1.31,10.49,1.97c0.2,0.04,0.25-0.02,0.27-0.23c0.03-0.5,0.09-0.99,0.15-1.48
-			c0.06-0.47,0.06-0.48-0.4-0.54c-1.18-0.16-2.37-0.32-3.55-0.48c-1.39-0.19-2.78-0.38-4.17-0.58c-0.41-0.05-0.82-0.12-1.23-0.17
-			c0.15-0.11,0.29-0.17,0.44-0.21c2.81-0.89,5.62-1.77,8.43-2.65c0.2-0.06,0.28-0.15,0.27-0.39c-0.02-0.59-0.02-1.17,0-1.75
-			c0.01-0.28-0.09-0.38-0.33-0.46c-1.15-0.39-2.31-0.8-3.45-1.19C37.03,41.75,35.25,41.13,33.38,40.48z M55.45,12.01
-			c-0.82,0-1.53,0.19-2.22,0.6c-2.05,1.23-2.05,4.06-0.87,5.4c0.54,0.61,1.25,0.95,1.96,1.28c0.52,0.24,1.05,0.44,1.51,0.81
-			c0.48,0.38,0.74,0.88,0.63,1.52c-0.17,1.04-0.96,1.63-2.01,1.55c-0.64-0.04-1.21-0.33-1.75-0.68c-0.23-0.15-0.3-0.09-0.4,0.13
-			c-0.18,0.4-0.36,0.8-0.57,1.17c-0.14,0.26-0.06,0.36,0.15,0.47c0.89,0.48,1.83,0.77,2.83,0.78c1.08,0.02,2.06-0.28,2.9-1.04
-			c1.49-1.35,1.77-4.34-0.46-5.69c-0.37-0.22-0.76-0.43-1.15-0.61c-0.55-0.27-1.12-0.49-1.6-0.9c-1-0.85-0.79-2.27,0.4-2.77
-			c0.46-0.2,0.94-0.21,1.42-0.13c0.57,0.1,1.07,0.38,1.56,0.67c0.14,0.08,0.22,0.11,0.32-0.08c0.22-0.43,0.47-0.85,0.71-1.28
-			c0.07-0.12,0.09-0.2-0.06-0.28C57.75,12.39,56.7,11.99,55.45,12.01z M63.29,19.52c-0.03,0-0.06,0-0.09,0c0,1.67,0,3.33,0,5.01
-			c0,0.23,0.05,0.3,0.28,0.3c0.56-0.02,1.11-0.01,1.67,0c0.19,0,0.25-0.05,0.25-0.26c0-0.85,0.02-1.7,0.03-2.56
-			c0.02-2.47,0.05-4.95,0.05-7.42c0-0.31,0.09-0.38,0.38-0.38c0.89,0.02,1.79,0,2.68,0.01c0.2,0,0.27-0.06,0.27-0.28
-			c-0.02-0.47-0.01-0.95,0-1.42c0.01-0.21-0.05-0.28-0.26-0.28c-2.77,0.01-5.54,0.01-8.32,0c-0.21,0-0.27,0.08-0.26,0.29
-			c0.01,0.47,0.01,0.95-0.01,1.42c-0.01,0.23,0.07,0.28,0.27,0.27c0.93-0.01,1.85,0,2.77-0.01c0.25,0,0.31,0.08,0.31,0.34
-			C63.29,16.21,63.29,17.86,63.29,19.52z M36.6,34.3c1.88,0.02,3.75,0.04,5.63,0.07c0.08,0,0.22-0.02,0.31-0.13
-			c0.08-0.1,0.06-0.23,0.06-0.31c-0.03-0.41-0.02-1.19,0-1.51c0-0.05,0.02-0.18-0.05-0.26c-0.05-0.04-0.12-0.07-0.24-0.06
-			c-0.99,0.01-1.97,0-2.96-0.01c-2.78-0.04-5.56-0.06-8.35-0.11c-0.28,0-0.35,0.08-0.34,0.37c0.02,0.56,0.02,1.13,0,1.69
-			c0,0.2,0.05,0.26,0.24,0.26C32.8,34.29,34.7,34.3,36.6,34.3z"/>
-		<path class="st0" d="M39.17,14.78c-0.51,0-1.03,0-1.54,0c-0.12,0-0.23-0.01-0.22-0.19c0.01-0.74-0.05-1.5,0.13-2.24
-			c0.17-0.7,0.54-1.23,1.25-1.37c0.66-0.13,1.28-0.06,1.73,0.56c0.28,0.39,0.39,0.85,0.41,1.33c0.03,0.57,0,1.15,0.01,1.72
-			c0,0.18-0.06,0.22-0.22,0.22c-0.51-0.01-1.03,0-1.54,0C39.17,14.8,39.17,14.79,39.17,14.78z"/>
-		<path class="st0" d="M78.43,21.22c0-0.54,0-1.08,0-1.62c0-0.11-0.02-0.23,0.15-0.23c0.77,0.02,1.55-0.09,2.31,0.16
-			c0.64,0.21,1.06,0.66,1.17,1.37c0.09,0.63,0,1.21-0.5,1.66c-0.34,0.3-0.75,0.45-1.18,0.47c-0.59,0.02-1.18,0-1.76,0.02
-			c-0.2,0-0.25-0.07-0.24-0.26c0.01-0.52,0-1.04,0-1.56C78.39,21.22,78.41,21.22,78.43,21.22z"/>
-		<path class="st0" d="M78.47,15.87c0-0.48,0.01-0.97,0-1.45c0-0.23,0.05-0.27,0.27-0.21c0.89,0.21,1.77,0.41,2.67,0.57
-			c0.39,0.07,0.5,0.32,0.54,0.65c0.14,1.11-0.44,1.91-1.48,2.11c-0.61,0.12-1.24,0.04-1.85,0.07c-0.18,0.01-0.17-0.1-0.17-0.23
-			c0-0.5,0-0.99,0-1.49C78.45,15.87,78.46,15.87,78.47,15.87z"/>
-		<path class="st0" d="M34.16,14.74c-0.46,0-0.92,0-1.38,0c-0.17,0-0.24-0.03-0.19-0.24c0.21-1.02,0.41-2.04,0.61-3.06
-			c0.04-0.2,0.14-0.3,0.33-0.34c1.12-0.29,2.03,0.42,2.19,1.68c0.07,0.58,0.03,1.16,0.06,1.75c0.01,0.18-0.07,0.22-0.22,0.22
-			C35.08,14.73,34.62,14.74,34.16,14.74z"/>
-	</g>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-11.svg b/assets/walkbybrussels/icons_wbb-11.svg
deleted file mode 100644
index 3023f6a6b3..0000000000
--- a/assets/walkbybrussels/icons_wbb-11.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<line class="st9" x1="15.53" y1="16.12" x2="86.49" y2="87.07"/>
-<line class="st9" x1="15.38" y1="86.63" x2="86.34" y2="15.68"/>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-12.svg b/assets/walkbybrussels/icons_wbb-12.svg
deleted file mode 100644
index 46d447f3da..0000000000
--- a/assets/walkbybrussels/icons_wbb-12.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<path class="st0" d="M90.9,34.75c-0.29,0.69-0.84,1.07-1.48,1.41C76.66,42.95,63.9,49.74,51.15,56.56
-	c-0.72,0.38-1.23,0.36-1.94-0.02c-12.74-6.82-25.5-13.61-38.26-20.41c-1.83-0.97-1.96-3.3-0.25-4.51c0.28-0.2,0.59-0.36,0.89-0.53
-	c12.2-6.61,24.4-13.21,36.58-19.85c1.43-0.78,2.68-0.76,4.1,0.02c12.13,6.62,24.29,13.2,36.45,19.77c1,0.54,1.8,1.19,2.19,2.28
-	C90.9,33.79,90.9,34.27,90.9,34.75z"/>
-<path class="st0" d="M49.4,92.53c-3.64-1.98-7.29-3.96-10.93-5.94c-9.01-4.89-18.02-9.77-27.03-14.66
-	c-1.67-0.91-2.39-2.33-1.75-3.78c0.28-0.64,0.82-1.28,1.41-1.64c1.72-1.05,3.51-1.97,5.3-2.88c0.27-0.14,0.76-0.04,1.06,0.12
-	c10.25,5.44,20.49,10.88,30.71,16.37c1.4,0.75,2.63,0.77,4.03,0.02c10.2-5.47,20.42-10.9,30.62-16.36c0.59-0.32,1.02-0.3,1.58,0.02
-	c1.35,0.79,2.72,1.54,4.12,2.24c1.05,0.53,1.91,1.21,2.38,2.32c0,0.48,0,0.96,0,1.44c-0.41,1.12-1.24,1.77-2.26,2.32
-	c-8.85,4.77-17.68,9.57-26.52,14.36c-3.71,2.01-7.42,4.03-11.13,6.05C50.46,92.53,49.93,92.53,49.4,92.53z"/>
-<path class="st0" d="M90.47,52.35c-0.32,0.71-0.93,1.07-1.59,1.42c-12.79,6.8-25.57,13.61-38.34,20.44
-	c-0.6,0.32-1.01,0.28-1.58-0.02C36.15,67.33,23.32,60.5,10.49,53.66c-1.65-0.88-1.94-2.81-0.6-4.15c0.29-0.29,0.67-0.53,1.03-0.73
-	c1.57-0.87,3.18-1.7,4.74-2.6c0.53-0.31,0.92-0.27,1.44,0.01c10.18,5.44,20.38,10.85,30.55,16.32c1.49,0.8,2.76,0.79,4.24-0.01
-	c10.17-5.47,20.37-10.87,30.55-16.32c0.53-0.28,0.92-0.31,1.44,0c1.37,0.8,2.76,1.57,4.19,2.28c1.05,0.52,1.91,1.19,2.4,2.28
-	C90.47,51.29,90.47,51.82,90.47,52.35z"/>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-13.svg b/assets/walkbybrussels/icons_wbb-13.svg
deleted file mode 100644
index ac73497a6c..0000000000
--- a/assets/walkbybrussels/icons_wbb-13.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<defs>
-		<rect id="SVGID_3_" x="15.21" y="5.12" width="68.1" height="89.76"/>
-	</defs>
-	<clipPath id="SVGID_2_">
-		<use xlink:href="#SVGID_3_"  style="overflow:visible;"/>
-	</clipPath>
-	<g class="st8">
-		<path class="st0" d="M16.86,28.45c3.15-10.22,11.43-18.53,21.6-21.7c10.77-3.35,22.23-1.49,30.97,4.98
-			c8.68,6.43,13.86,16.72,13.86,27.54c0,7.46-2.35,14.55-6.8,20.5l-27.26,35.1L22,59.78C15.34,50.87,13.47,39.45,16.86,28.45z
-			 M49.25,57.69c10.11,0,18.34-8.26,18.34-18.41c0-10.15-8.23-18.41-18.34-18.41c-10.11,0-18.34,8.26-18.34,18.41
-			C30.92,49.43,39.14,57.69,49.25,57.69z"/>
-		<path class="st0" d="M49.25,26.16c7.22,0,13.1,5.87,13.1,13.12c0,7.25-5.88,13.15-13.1,13.15c-7.22,0-13.1-5.9-13.1-13.15
-			C36.16,32.03,42.03,26.16,49.25,26.16z"/>
-	</g>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-14.svg b/assets/walkbybrussels/icons_wbb-14.svg
deleted file mode 100644
index aa08bad59c..0000000000
--- a/assets/walkbybrussels/icons_wbb-14.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<path class="st0" d="M84.93,94.88c-2.17-0.47-3.76-1.79-5.28-3.29c-7.88-7.73-15.81-15.43-23.71-23.16
-	c-0.51-0.5-0.85-0.59-1.51-0.23c-5.84,3.21-12.14,4.63-18.81,4.23c-8.36-0.52-15.66-3.59-21.78-9.25C8.24,58,4.8,51.65,3.49,44.27
-	C2.37,37.98,3,31.8,5.48,25.85C9,17.43,15,11.31,23.44,7.52c4.7-2.11,9.65-3.12,14.82-2.99c8.81,0.23,16.52,3.24,23,9.14
-	c4.75,4.33,7.98,9.57,9.73,15.67c1.45,5.05,1.69,10.17,0.7,15.35c-0.93,4.87-2.87,9.3-5.92,13.69c0.27,0.15,0.65,0.27,0.9,0.51
-	c8.1,7.86,16.19,15.74,24.27,23.62c2.64,2.57,3.11,5.94,1.26,9c-0.92,1.52-2.28,2.54-4.02,3.05c-0.31,0.09-0.61,0.22-0.91,0.33
-	C86.49,94.88,85.71,94.88,84.93,94.88z M37.6,16.67c-12.31,0-22.33,9.79-22.3,21.85c0.02,12.08,9.8,21.89,22.35,21.91
-	c12.31,0.03,22.27-9.87,22.27-21.92C59.92,26.47,49.89,16.67,37.6,16.67z"/>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-15.svg b/assets/walkbybrussels/icons_wbb-15.svg
deleted file mode 100644
index 03964b8c36..0000000000
--- a/assets/walkbybrussels/icons_wbb-15.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<rect x="1.17" y="58.13" class="st5" width="97.83" height="11"/>
-	<rect x="9.27" y="26.88" class="st5" width="79.83" height="11"/>
-	<rect x="9.42" y="12.9" class="st5" width="79.83" height="11"/>
-	<path class="st5" d="M93.89,49.3c-29.59-0.01-59.17-0.01-88.76-0.02c-0.94,2.09-1.87,4.17-2.8,6.25c31.73,0,63.46,0,95.2,0
-		C96.32,53.46,95.11,51.38,93.89,49.3z"/>
-	<path class="st5" d="M8.99,40.86c-0.95,2.07-1.89,4.14-2.83,6.21c28.79-0.05,57.58-0.1,86.36-0.16c-1.16-2-2.32-4.01-3.47-6.01
-		C62.37,40.9,35.68,40.88,8.99,40.86z"/>
-	<rect x="10.14" y="71.15" class="st5" width="5.52" height="21.23"/>
-	<rect x="82.03" y="71.15" class="st5" width="5.52" height="21.23"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-16.svg b/assets/walkbybrussels/icons_wbb-16.svg
deleted file mode 100644
index 773759e065..0000000000
--- a/assets/walkbybrussels/icons_wbb-16.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st3" d="M56.43,11.59c-0.99-0.55-2.04-0.94-3.29-0.93c-0.82,0-1.53,0.19-2.22,0.6c-2.05,1.23-2.05,4.06-0.87,5.4
-		c0.54,0.61,1.25,0.95,1.96,1.28c0.52,0.24,1.05,0.44,1.51,0.81c0.48,0.38,0.74,0.88,0.63,1.52c-0.17,1.04-0.96,1.63-2.01,1.55
-		c-0.64-0.04-1.21-0.33-1.75-0.68c-0.23-0.15-0.3-0.09-0.4,0.13c-0.18,0.4-0.36,0.8-0.57,1.17c-0.14,0.26-0.06,0.36,0.15,0.47
-		c0.89,0.48,1.83,0.77,2.83,0.78c1.08,0.02,2.06-0.28,2.9-1.04c1.49-1.35,1.77-4.34-0.46-5.69c-0.37-0.22-0.76-0.43-1.15-0.61
-		c-0.55-0.27-1.12-0.49-1.6-0.9c-1-0.85-0.79-2.27,0.4-2.77c0.46-0.2,0.94-0.21,1.42-0.13c0.57,0.1,1.07,0.38,1.56,0.67
-		c0.14,0.08,0.22,0.11,0.32-0.08c0.22-0.43,0.47-0.85,0.71-1.28C56.57,11.75,56.58,11.67,56.43,11.59z"/>
-	<path class="st3" d="M66.23,10.89c-2.77,0.01-5.54,0.01-8.32,0c-0.21,0-0.27,0.08-0.26,0.29c0.01,0.47,0.01,0.95-0.01,1.42
-		c-0.01,0.23,0.07,0.28,0.27,0.27c0.93-0.01,1.85,0,2.77-0.01c0.25,0,0.31,0.08,0.31,0.34c-0.02,1.66-0.01,3.31-0.01,4.97
-		c-0.03,0-0.06,0-0.09,0c0,1.67,0,3.33,0,5.01c0,0.23,0.05,0.3,0.28,0.3c0.56-0.02,1.11-0.01,1.67,0c0.19,0,0.25-0.05,0.25-0.26
-		c0-0.85,0.02-1.7,0.03-2.56c0.02-2.47,0.05-4.95,0.05-7.42c0-0.31,0.09-0.38,0.38-0.38c0.89,0.02,1.79,0,2.68,0.01
-		c0.2,0,0.27-0.06,0.27-0.28c-0.02-0.47-0.01-0.95,0-1.42C66.49,10.96,66.43,10.89,66.23,10.89z"/>
-	<path class="st3" d="M34.19,38.78c0.99-0.1,1.98-0.2,2.97-0.3c1-0.1,2-0.21,3-0.3c0.38-0.04,0.39-0.04,0.35-0.43
-		c-0.06-0.56-0.13-1.11-0.17-1.67c-0.02-0.21-0.07-0.27-0.27-0.24c-1.24,0.2-2.48,0.38-3.73,0.57c-1.51,0.23-3.02,0.47-4.53,0.71
-		c-1.08,0.17-2.17,0.35-3.26,0.51c-0.17,0.02-0.2,0.09-0.2,0.25c0.01,0.62,0.02,1.24,0,1.85c-0.01,0.25,0.09,0.31,0.28,0.38
-		c3,1.09,6,2.19,8.99,3.29c0.09,0.03,0.2,0.03,0.26,0.17c-1.23,0.39-2.43,0.78-3.64,1.17c-1.89,0.6-3.78,1.2-5.67,1.81
-		c-0.14,0.04-0.22,0.11-0.22,0.3c0.01,0.64,0.01,1.28,0,1.92c0,0.17,0.05,0.24,0.2,0.26c0.34,0.05,0.68,0.11,1.02,0.17
-		c3.5,0.66,7,1.31,10.49,1.97c0.2,0.04,0.25-0.02,0.27-0.23c0.03-0.5,0.09-0.99,0.15-1.48c0.06-0.47,0.06-0.48-0.4-0.54
-		c-1.18-0.16-2.37-0.32-3.55-0.48c-1.39-0.19-2.78-0.38-4.17-0.58c-0.41-0.05-0.82-0.12-1.23-0.17c0.15-0.11,0.29-0.17,0.44-0.21
-		c2.81-0.89,5.62-1.77,8.43-2.65c0.2-0.06,0.28-0.15,0.27-0.39c-0.02-0.59-0.02-1.17,0-1.75c0.01-0.28-0.09-0.38-0.33-0.46
-		c-1.15-0.39-2.31-0.8-3.45-1.19c-1.78-0.61-3.56-1.24-5.43-1.88c0.13-0.04,0.18-0.06,0.24-0.07
-		C32.27,38.97,33.23,38.88,34.19,38.78z"/>
-	<path class="st3" d="M28.6,32.96c1.9-0.01,3.8-0.01,5.7-0.01c1.88,0.02,3.75,0.04,5.63,0.07c0.08,0,0.22-0.02,0.31-0.13
-		c0.08-0.1,0.06-0.23,0.06-0.31c-0.03-0.41-0.02-1.19,0-1.51c0-0.05,0.02-0.18-0.05-0.26c-0.05-0.04-0.12-0.07-0.24-0.06
-		c-0.99,0.01-1.97,0-2.96-0.01c-2.78-0.04-5.56-0.06-8.35-0.11c-0.28,0-0.35,0.08-0.34,0.37c0.02,0.56,0.02,1.13,0,1.69
-		C28.35,32.9,28.4,32.96,28.6,32.96z"/>
-	<path class="st5" d="M86.06,14.97c-1.35-0.3-2.7-0.61-4.04-0.92c-0.19-0.04-0.28-0.02-0.29,0.23c-0.08,1.39-0.64,2.41-2.01,2.81
-		c0.4,0.1,0.78,0.24,1.12,0.48c1.51,1.12,1.51,3.78,0.01,5.01c-0.77,0.63-1.67,0.85-2.62,0.86c-1.32,0.02-2.65,0-3.97,0.01
-		c-0.31,0-0.42-0.06-0.41-0.42c0.06-3.48,0.09-6.96,0.14-10.44c0-0.27-0.08-0.36-0.31-0.41c-0.99-0.21-1.98-0.43-2.97-0.66
-		c-0.28-0.06-0.31,0.07-0.31,0.31c-0.02,3.27-0.05,6.54-0.07,9.81c0,0.52-0.01,1.04,0,1.56c0,0.18-0.04,0.25-0.23,0.25
-		c-0.59-0.01-1.18-0.01-1.76,0c-0.16,0-0.24-0.04-0.22-0.22c0.01-0.08,0-0.16,0-0.23c0.04-3.89,0.08-7.78,0.12-11.67
-		c0-0.2,0-0.35-0.24-0.4c-1.6-0.35-3.21-0.71-4.81-1.07c-3.23-0.72-6.46-1.44-9.68-2.17c-2.2-0.49-4.39-0.99-6.59-1.48
-		c-2.92-0.65-5.84-1.31-8.77-1.96c-1.85-0.41-3.7-0.82-5.54-1.24c-0.24-0.05-0.3,0.02-0.34,0.25c-0.23,1.23-0.48,2.46-0.72,3.68
-		c-0.09,0.46-0.1,0.46,0.33,0.54c0.09,0.02,0.19,0.03,0.28,0.05c0.93,0.2,1.65,0.68,1.98,1.67c0.05,0.14,0.03,0.3,0.13,0.42
-		c0.09-0.26,0.15-0.53,0.26-0.78c0.75-1.79,3.08-1.97,4.36-1.02c0.93,0.7,1.35,1.71,1.39,2.87c0.06,1.56,0.02,3.12,0.04,4.67
-		c0,0.34-0.08,0.42-0.4,0.42c-3.29-0.04-6.57-0.06-9.86-0.1c-0.22,0-0.31,0.07-0.35,0.29c-0.08,0.51-0.16,1.02-0.28,1.52
-		c-0.06,0.22,0.02,0.29,0.19,0.36c1.14,0.47,2.28,0.95,3.41,1.42c2.34,0.98,4.68,1.95,7.03,2.93c0.18,0.08,0.26,0.17,0.25,0.38
-		c-0.02,0.54-0.02,1.08,0,1.62c0.01,0.21-0.06,0.3-0.25,0.38c-1.16,0.44-2.31,0.9-3.47,1.35c-2.49,0.97-4.97,1.94-7.46,2.93
-		c-0.24,0.1-0.31,0.04-0.38-0.2c-0.16-0.58-0.33-1.16-0.52-1.73c-0.08-0.24-0.03-0.32,0.19-0.39c2.32-0.79,4.63-1.58,6.95-2.38
-		c0.71-0.25,1.43-0.49,2.14-0.73c-0.03-0.08-0.08-0.1-0.13-0.12c-2.75-1.06-5.49-2.13-8.24-3.19c-0.19-0.07-0.24-0.04-0.28,0.17
-		c-0.48,2.42-0.97,4.84-1.46,7.26c-0.66,3.28-1.32,6.56-1.98,9.84s-1.32,6.56-1.98,9.84c-0.66,3.29-1.32,6.58-1.99,9.87
-		c-0.7,3.47-1.4,6.95-2.1,10.42c-0.64,3.17-1.29,6.34-1.93,9.51c-0.71,3.5-1.41,7.01-2.12,10.52c-0.5,2.47-0.99,4.95-1.49,7.42
-		c-0.02,0.08-0.1,0.16,0.03,0.22c0.11,0,0.23-0.01,0.34-0.03c18.62,0,37.24,0,55.85,0c0.05,0,0.11,0,0.16,0
-		c0.02-0.09,0.05-0.17,0.07-0.26c0.43-2.14,0.85-4.28,1.28-6.42c0.85-4.22,1.71-8.45,2.56-12.67c0.89-4.44,1.78-8.89,2.67-13.33
-		c0.75-3.73,1.5-7.46,2.26-11.19c0.66-3.28,1.33-6.57,1.99-9.86c0.62-3.08,1.23-6.15,1.85-9.23c0.66-3.28,1.32-6.56,1.98-9.84
-		c0.48-2.36,0.94-4.73,1.43-7.09C86.32,15.05,86.24,15.01,86.06,14.97z M28.69,30.64c2.78,0.04,5.56,0.07,8.35,0.11
-		c0.99,0.01,1.98,0.02,2.96,0.01c0.12,0,0.2,0.02,0.24,0.06c0.07,0.08,0.06,0.2,0.05,0.26c-0.03,0.32-0.04,1.1,0,1.51
-		c0.01,0.08,0.02,0.21-0.06,0.31c-0.08,0.11-0.22,0.13-0.31,0.13c-1.88-0.03-3.75-0.04-5.63-0.07c-1.9,0-3.8,0-5.7,0.01
-		c-0.2,0-0.25-0.06-0.24-0.26c0.01-0.56,0.02-1.13,0-1.69C28.34,30.72,28.41,30.63,28.69,30.64z M36.51,41.02
-		c1.15,0.4,2.3,0.81,3.45,1.19c0.24,0.08,0.34,0.18,0.33,0.46c-0.02,0.58-0.02,1.17,0,1.75c0.01,0.24-0.07,0.33-0.27,0.39
-		c-2.81,0.88-5.62,1.76-8.43,2.65c-0.15,0.04-0.29,0.1-0.44,0.21c0.41,0.05,0.82,0.12,1.23,0.17c1.39,0.2,2.78,0.39,4.17,0.58
-		c1.18,0.17,2.37,0.33,3.55,0.48c0.46,0.06,0.46,0.07,0.4,0.54c-0.06,0.49-0.12,0.98-0.15,1.48c-0.02,0.21-0.07,0.26-0.27,0.23
-		c-3.5-0.66-7-1.31-10.49-1.97c-0.34-0.06-0.68-0.12-1.02-0.17c-0.16-0.02-0.2-0.09-0.2-0.26c0.01-0.64,0.01-1.28,0-1.92
-		c0-0.18,0.07-0.25,0.22-0.3c1.89-0.6,3.78-1.21,5.67-1.81c1.21-0.38,2.42-0.77,3.64-1.17c-0.06-0.13-0.17-0.13-0.26-0.17
-		c-3-1.1-5.99-2.2-8.99-3.29c-0.19-0.07-0.28-0.13-0.28-0.38c0.02-0.62,0.01-1.24,0-1.85c0-0.16,0.03-0.22,0.2-0.25
-		c1.09-0.16,2.17-0.34,3.26-0.51c1.51-0.24,3.02-0.48,4.53-0.71c1.24-0.19,2.49-0.37,3.73-0.57c0.2-0.03,0.25,0.03,0.27,0.24
-		c0.05,0.56,0.11,1.11,0.17,1.67c0.05,0.38,0.03,0.39-0.35,0.43c-1,0.09-2,0.19-3,0.3c-0.99,0.1-1.98,0.2-2.97,0.3
-		c-0.96,0.1-1.92,0.19-2.88,0.29c-0.05,0-0.1,0.03-0.24,0.07C32.94,39.78,34.73,40.41,36.51,41.02z M56.5,11.87
-		c-0.24,0.43-0.49,0.85-0.71,1.28c-0.09,0.18-0.18,0.16-0.32,0.08c-0.49-0.29-0.99-0.57-1.56-0.67c-0.48-0.08-0.96-0.06-1.42,0.13
-		c-1.19,0.51-1.4,1.93-0.4,2.77c0.48,0.4,1.05,0.63,1.6,0.9c0.39,0.19,0.78,0.39,1.15,0.61c2.24,1.35,1.96,4.34,0.46,5.69
-		c-0.84,0.76-1.83,1.06-2.9,1.04c-1-0.01-1.94-0.3-2.83-0.78c-0.22-0.12-0.29-0.22-0.15-0.47c0.21-0.38,0.39-0.77,0.57-1.17
-		c0.1-0.21,0.17-0.28,0.4-0.13c0.53,0.35,1.1,0.63,1.75,0.68c1.05,0.08,1.84-0.51,2.01-1.55c0.11-0.64-0.14-1.14-0.63-1.52
-		c-0.46-0.36-0.99-0.56-1.51-0.81c-0.71-0.33-1.41-0.67-1.96-1.28c-1.18-1.34-1.18-4.17,0.87-5.4c0.69-0.42,1.4-0.6,2.22-0.6
-		c1.25-0.02,2.3,0.38,3.29,0.93C56.58,11.67,56.57,11.75,56.5,11.87z M66.48,12.6c0.01,0.22-0.06,0.28-0.27,0.28
-		c-0.89-0.01-1.79,0.01-2.68-0.01c-0.28,0-0.38,0.07-0.38,0.38c-0.01,2.47-0.03,4.95-0.05,7.42c-0.01,0.85-0.03,1.71-0.03,2.56
-		c0,0.21-0.06,0.26-0.25,0.26c-0.55-0.01-1.11-0.02-1.67,0c-0.22,0-0.28-0.07-0.28-0.3c0.01-1.67,0-3.34,0-5.01
-		c0.03,0,0.06,0,0.09,0c0-1.66,0-3.31,0.01-4.97c0-0.26-0.06-0.34-0.31-0.34c-0.93,0.02-1.85,0-2.77,0.01
-		c-0.2,0-0.28-0.04-0.27-0.27c0.02-0.47,0.02-0.95,0.01-1.42c-0.01-0.21,0.05-0.29,0.26-0.29c2.77,0.01,5.54,0.01,8.32,0
-		c0.21,0,0.27,0.07,0.26,0.28C66.47,11.65,66.47,12.12,66.48,12.6z"/>
-	<path class="st5" d="M35.33,13.43c0.51,0,1.03,0,1.54,0c0,0.01,0,0.02,0,0.03c0.51,0,1.03,0,1.54,0c0.16,0,0.22-0.04,0.22-0.22
-		c-0.01-0.57,0.02-1.15-0.01-1.72c-0.02-0.47-0.13-0.94-0.41-1.33c-0.45-0.62-1.07-0.69-1.73-0.56C35.77,9.77,35.4,10.3,35.23,11
-		c-0.17,0.74-0.11,1.49-0.13,2.24C35.1,13.42,35.21,13.43,35.33,13.43z"/>
-	<path class="st5" d="M76.07,19.87c0,0.52,0.01,1.04,0,1.56c0,0.2,0.05,0.27,0.24,0.26c0.59-0.01,1.18,0,1.76-0.02
-		c0.44-0.02,0.85-0.17,1.18-0.47c0.49-0.44,0.59-1.02,0.5-1.66c-0.11-0.72-0.52-1.16-1.17-1.37c-0.76-0.25-1.54-0.13-2.31-0.16
-		c-0.17,0-0.15,0.12-0.15,0.23c0,0.54,0,1.08,0,1.62C76.1,19.87,76.08,19.87,76.07,19.87z"/>
-	<path class="st5" d="M76.13,16.01c0,0.13,0,0.24,0.17,0.23c0.62-0.03,1.24,0.05,1.85-0.07c1.04-0.2,1.62-1,1.48-2.11
-		c-0.04-0.33-0.15-0.58-0.54-0.65c-0.9-0.16-1.78-0.36-2.67-0.57c-0.22-0.05-0.27-0.01-0.27,0.21c0.01,0.48,0,0.97,0,1.45
-		c-0.01,0-0.02,0-0.04,0C76.13,15.01,76.13,15.51,76.13,16.01z"/>
-	<path class="st5" d="M31.85,13.39c0.46,0,0.92,0,1.38,0c0.16,0,0.23-0.04,0.22-0.22c-0.02-0.58,0.02-1.16-0.06-1.75
-		c-0.16-1.26-1.07-1.97-2.19-1.68c-0.19,0.05-0.29,0.15-0.33,0.34c-0.2,1.02-0.4,2.04-0.61,3.06c-0.05,0.21,0.02,0.25,0.19,0.24
-		C30.93,13.38,31.39,13.39,31.85,13.39z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-17.svg b/assets/walkbybrussels/icons_wbb-17.svg
deleted file mode 100644
index 94a9ac1442..0000000000
--- a/assets/walkbybrussels/icons_wbb-17.svg
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st5" d="M39.19,90.45c1.19-1.21,2.14-2.6,2.82-4.12c0.32-0.8,0.56-1.63,0.69-2.51c-0.78-0.07-1.56-0.15-2.32-0.24
-		C34.94,83,29.6,81.8,24.45,80.03c-6.62-2.2-12.28-5.09-16.59-8.17c4.87,9.2,12.6,16.56,22.03,20.97c0.02,0,0.04,0,0.07,0.01
-		c0.02,0,0.05,0,0.07,0.01C33.28,93.24,36.55,92.39,39.19,90.45C39.19,90.45,39.19,90.45,39.19,90.45z"/>
-	<path class="st5" d="M11.43,22.5c0.02,3.82,7.1,11.91,13.94,19.75c10.48,11.99,22.36,25.6,22.36,36.95
-		c0.01,0.14,0.02,0.26,0.03,0.4c2.98,0.1,5.97,0.02,8.95-0.25c-0.53-46.13-3.67-55.57-15.48-76.14c-0.05-0.09-0.09-0.17-0.13-0.26
-		c-11.98,2.3-22.62,9.1-29.73,19.01c0.04,0.18,0.07,0.36,0.07,0.54C11.43,22.49,11.43,22.5,11.43,22.5z"/>
-	<path class="st5" d="M88.72,22.03c0.79,9.29-3.05,18.48-6.79,27.46c-3.93,7.87-6.29,16.42-6.97,25.18c0,0.05,0,0.1,0,0.15
-		c7.36-3.19,14.09-7.87,19.71-13.84c0.72-0.78,1.42-1.58,2.1-2.4C99.26,45.81,96.35,32.59,88.72,22.03z"/>
-	<path class="st5" d="M12.09,69.21c0.05,0.03,0.1,0.07,0.16,0.1c7.44,4.72,18.65,8.83,30.95,9.98v-0.1
-		c0-9.66-11.78-23.14-21.24-33.96c-3.04-3.13-5.86-6.46-8.45-9.98c-2.39-3.02-4.27-5.75-5.41-8.2c-1.41,2.59-2.56,5.29-3.46,8.05
-		c-0.03,0.1-0.06,0.19-0.09,0.28c-0.06,0.18-0.11,0.36-0.16,0.53c-0.07,0.22-0.13,0.43-0.2,0.65c-0.02,0.09-0.05,0.18-0.07,0.26
-		c-0.09,0.31-0.17,0.63-0.25,0.94c0,0.01,0,0.03-0.01,0.05c-0.98,3.79-1.49,7.76-1.49,11.86c0,0.18,0,0.36,0.01,0.53
-		c0,0.16,0,0.33,0,0.49c0.09,3.68,0.61,7.37,1.57,10.98c0.12,0.12,0.23,0.25,0.33,0.4c1.47,2.31,4.12,4.73,7.65,7.02
-		C11.98,69.15,12.03,69.17,12.09,69.21z"/>
-	<path class="st5" d="M70.42,75.19c0-0.17-0.01-0.35-0.01-0.53c0.64-9.37,3.13-18.52,7.32-26.93c4.84-11.59,9.39-22.53,4.31-33.17
-		C73.59,6.78,62.6,2.36,51.13,2.08C50.76,2.07,50.38,2.06,50,2.06c0,0,0,0,0,0c-1.36,0-2.71,0.09-4.07,0.21
-		c12.1,21.31,14.86,32.77,15.33,76.49c3.13-0.5,6.21-1.25,9.22-2.23C70.45,76.1,70.43,75.65,70.42,75.19z"/>
-	<path class="st5" d="M56.76,84.04c-3.08,0.27-6.19,0.33-9.32,0.15c-0.21,1.08-0.52,2.13-0.92,3.15c-0.88,2.47-2.35,4.7-4.31,6.48
-		c-0.03,0.03-0.06,0.06-0.09,0.09c-0.02,0.01-0.03,0.02-0.05,0.04c-0.99,0.82-2.1,1.49-3.28,2c3.67,0.91,7.44,1.38,11.21,1.39
-		c2.28-0.02,4.56-0.2,6.81-0.54c0-0.05,0-0.11,0-0.17c0-4.2-0.01-8.17-0.04-11.9C56.77,84.5,56.77,84.26,56.76,84.04z"/>
-	<path class="st5" d="M75.8,80.37c0.31,0.89,0.69,1.62,1.1,2.26c0.99,1.43,2.41,2.55,4.11,3.15c5.65-4.85,10.08-10.95,12.96-17.81
-		c-5.47,4.87-11.7,8.74-18.38,11.48C75.64,79.77,75.71,80.08,75.8,80.37z"/>
-	<path class="st5" d="M72.44,83.95c-0.25-0.45-0.47-0.92-0.66-1.4c-0.19-0.47-0.36-0.96-0.52-1.49c-3.24,1.07-6.57,1.88-9.96,2.43
-		c0.03,3.9,0.04,8.03,0.05,12.44c5.62-1.37,10.94-3.75,15.7-7.04C75.45,87.91,73.73,86.36,72.44,83.95z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-18.svg b/assets/walkbybrussels/icons_wbb-18.svg
deleted file mode 100644
index 273cf422fc..0000000000
--- a/assets/walkbybrussels/icons_wbb-18.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<path class="st5" d="M82.32,62.19c-0.12-3.75-1.24-7.25-2.56-10.7c-2.67-6.96-6.26-13.44-10.19-19.72
-	c-5.29-8.43-10.79-16.72-16.18-25.09c-0.66-1.03-1.39-1.97-2.5-2.5c-0.53,0-1.05,0-1.58,0c-1.15,0.43-1.92,1.27-2.54,2.33
-	c-0.73,1.25-1.54,2.46-2.34,3.67c-6.27,9.38-12.57,18.74-18.05,28.63c-2.8,5.05-5.37,10.23-7.16,15.77
-	c-0.9,2.78-1.57,5.61-1.54,8.56c0.04,5.18,1.21,10.08,3.52,14.7c3.12,6.22,7.73,10.95,13.77,14.19c6.18,3.31,12.75,4.47,19.69,3.46
-	c4.97-0.73,9.52-2.55,13.63-5.47c5.98-4.25,10.19-9.92,12.5-17C81.91,69.49,82.44,65.89,82.32,62.19z M49.73,13.62
-	c0.06-0.1,0.14-0.18,0.31-0.4c0,0.01,0.01,0.01,0.01,0.02c-0.16,0.2-0.24,0.29-0.3,0.38c-3.67,5.75-7.37,11.47-11.03,17.23
-	C42.39,25.1,46.07,19.36,49.73,13.62z M34.56,84.13c-5.13-3.8-8.33-8.9-9.83-15.16c-1.08-4.56-0.81-9.02,0.78-13.42
-	c2.2-6.1,5.13-11.82,8.52-17.28c1.02-1.64,2.07-3.27,3.11-4.91c-1.03,1.63-2.07,3.27-3.09,4.91c-3.4,5.46-6.32,11.19-8.52,17.28
-	c-1.59,4.41-1.86,8.87-0.78,13.42c1.5,6.26,4.7,11.37,9.83,15.17c4.39,3.25,9.23,4.97,14.54,5.14
-	C43.8,89.11,38.96,87.39,34.56,84.13z"/>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-19.svg b/assets/walkbybrussels/icons_wbb-19.svg
deleted file mode 100644
index b5302e68cc..0000000000
--- a/assets/walkbybrussels/icons_wbb-19.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<circle class="st0" cx="50.31" cy="50" r="46.53"/>
-</g>
-<g>
-	<defs>
-		<rect id="SVGID_5_" x="29.75" y="27.28" width="43.28" height="43.28"/>
-	</defs>
-	<clipPath id="SVGID_2_">
-		<use xlink:href="#SVGID_5_"  style="overflow:visible;"/>
-	</clipPath>
-	<g class="st8">
-		<path class="st12" d="M69.01,70.56c-1.04-0.23-1.8-0.86-2.53-1.57c-3.78-3.7-7.57-7.39-11.36-11.09
-			c-0.24-0.24-0.41-0.28-0.72-0.11c-2.8,1.54-5.82,2.22-9.01,2.02c-4.01-0.25-7.5-1.72-10.43-4.43c-2.68-2.48-4.33-5.52-4.95-9.06
-			c-0.54-3.01-0.23-5.97,0.95-8.82c1.69-4.04,4.56-6.97,8.6-8.78c2.25-1.01,4.62-1.5,7.1-1.43c4.22,0.11,7.91,1.55,11.02,4.38
-			c2.27,2.07,3.82,4.58,4.66,7.5c0.7,2.42,0.81,4.87,0.33,7.35c-0.45,2.33-1.37,4.45-2.83,6.56c0.13,0.07,0.31,0.13,0.43,0.25
-			c3.88,3.77,7.75,7.54,11.62,11.31c1.26,1.23,1.49,2.84,0.6,4.31c-0.44,0.73-1.09,1.22-1.93,1.46c-0.15,0.04-0.29,0.11-0.44,0.16
-			C69.76,70.56,69.39,70.56,69.01,70.56z M46.34,33.1c-5.89,0-10.69,4.69-10.68,10.47c0.01,5.79,4.69,10.48,10.71,10.49
-			c5.89,0.01,10.67-4.73,10.67-10.5C57.04,37.8,52.23,33.1,46.34,33.1z"/>
-	</g>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb-20.svg b/assets/walkbybrussels/icons_wbb-20.svg
deleted file mode 100644
index 34b8da8987..0000000000
--- a/assets/walkbybrussels/icons_wbb-20.svg
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<circle class="st12" cx="50.31" cy="50" r="46.66"/>
-</g>
-<path class="st0" d="M70.93,41.51c-0.15,0.35-0.42,0.54-0.75,0.71c-6.43,3.42-12.86,6.84-19.28,10.27
-	c-0.36,0.19-0.62,0.18-0.98-0.01c-6.42-3.44-12.85-6.86-19.27-10.28c-0.92-0.49-0.99-1.66-0.13-2.27c0.14-0.1,0.3-0.18,0.45-0.26
-	c6.14-3.33,12.29-6.65,18.43-10c0.72-0.39,1.35-0.38,2.07,0.01c6.11,3.33,12.23,6.65,18.36,9.96c0.5,0.27,0.91,0.6,1.1,1.15
-	C70.93,41.03,70.93,41.27,70.93,41.51z"/>
-<path class="st0" d="M50.02,70.62c-1.84-1-3.67-1.99-5.51-2.99c-4.54-2.46-9.08-4.92-13.62-7.38c-0.84-0.46-1.2-1.17-0.88-1.9
-	c0.14-0.32,0.41-0.64,0.71-0.82c0.86-0.53,1.77-0.99,2.67-1.45c0.14-0.07,0.38-0.02,0.53,0.06c5.16,2.74,10.32,5.48,15.47,8.25
-	c0.71,0.38,1.32,0.39,2.03,0.01c5.14-2.76,10.29-5.49,15.42-8.24c0.3-0.16,0.51-0.15,0.8,0.01c0.68,0.4,1.37,0.77,2.07,1.13
-	c0.53,0.27,0.96,0.61,1.2,1.17c0,0.24,0,0.48,0,0.73c-0.21,0.56-0.62,0.89-1.14,1.17c-4.46,2.4-8.91,4.82-13.36,7.23
-	c-1.87,1.01-3.74,2.03-5.6,3.05C50.56,70.62,50.29,70.62,50.02,70.62z"/>
-<path class="st0" d="M70.71,50.38c-0.16,0.36-0.47,0.54-0.8,0.71c-6.44,3.42-12.88,6.85-19.31,10.29c-0.3,0.16-0.51,0.14-0.79-0.01
-	c-6.46-3.45-12.92-6.89-19.38-10.34c-0.83-0.44-0.98-1.41-0.3-2.09c0.15-0.15,0.34-0.26,0.52-0.37c0.79-0.44,1.6-0.85,2.39-1.31
-	c0.27-0.15,0.46-0.14,0.73,0c5.13,2.74,10.26,5.47,15.39,8.22c0.75,0.4,1.39,0.4,2.14,0c5.12-2.75,10.26-5.48,15.39-8.22
-	c0.27-0.14,0.46-0.15,0.73,0c0.69,0.4,1.39,0.79,2.11,1.15c0.53,0.26,0.96,0.6,1.21,1.15C70.71,49.84,70.71,50.11,70.71,50.38z"/>
-</svg>
diff --git a/assets/walkbybrussels/icons_wbb_Tekengebied 1.svg b/assets/walkbybrussels/icons_wbb_Tekengebied 1.svg
deleted file mode 100644
index fba5612f61..0000000000
--- a/assets/walkbybrussels/icons_wbb_Tekengebied 1.svg	
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st3" d="M22.18,92.56c0,0,0,0.01,0.01,0.01c0.97,0.56,2.04,1.14,3.22,1.69c0,0,0,0,0,0
-		C24.23,93.71,23.15,93.13,22.18,92.56C22.19,92.56,22.18,92.56,22.18,92.56z"/>
-	<path class="st3" d="M31.45,55.28c1.33-3.83-0.4-8.1-3.87-9.52c-3.47-1.42-7.37,0.55-8.7,4.38c-1.33,3.83,0.4,8.1,3.86,9.52
-		C26.21,61.08,30.12,59.12,31.45,55.28z"/>
-	<path class="st3" d="M20.76,94.39c0.46,0.34,0.92,0.67,1.38,0.97C21.68,95.05,21.22,94.73,20.76,94.39
-		C20.76,94.39,20.76,94.39,20.76,94.39z"/>
-	<path class="st3" d="M22.13,95.37C22.13,95.36,22.13,95.36,22.13,95.37c-0.44,0.29-1.01,0.3-1.49,0c0,0,0.01,0.01,0.01,0.01
-		C21.12,95.67,21.69,95.65,22.13,95.37z"/>
-	<path class="st3" d="M35.74,71c-3.18-1.31-6.76,0.5-7.99,4.01c-1.22,3.52,0.36,7.44,3.55,8.74c3.18,1.3,6.77-0.5,7.99-4.02
-		C40.51,76.22,38.92,72.3,35.74,71z"/>
-	<path class="st3" d="M38.64,22.51c-3.47-1.42-7.37,0.55-8.7,4.38c-1.33,3.83,0.4,8.1,3.86,9.52c3.47,1.42,7.37-0.54,8.7-4.37
-		C43.84,28.2,42.1,23.93,38.64,22.51z"/>
-	<path class="st3" d="M58.97,13.28c-2.59-1.06-5.51,0.41-6.5,3.27c-0.99,2.86,0.3,6.06,2.88,7.11c2.59,1.06,5.5-0.41,6.5-3.27
-		C62.85,17.53,61.56,14.34,58.97,13.28z"/>
-	<path class="st4" d="M91.37,11.51C63.22-7.72,24.2-3.67,8.98,29.84c-6.77,14.91-6.89,31.7-0.36,49.91
-		c0.26,0.73,0.54,1.44,0.85,2.13c3.34,5.36,7.29,9.52,11.29,12.5c0,0,0,0-0.01,0c0,0,0,0,0,0c-4.01-2.97-7.95-7.15-11.29-12.5
-		c2.38,5.47,6.06,10,10.75,13.2c0,0,0,0,0,0c0.07,0.05,0.15,0.1,0.22,0.15c-0.07-0.05-0.16-0.1-0.22-0.14
-		c0.14,0.09,0.28,0.19,0.42,0.29c0.01,0.01,0.02,0,0.03,0.01c0,0-0.01-0.01-0.01-0.01c0.48,0.31,1.05,0.29,1.49,0
-		c0,0,0,0.01-0.01,0.01c-0.44,0.29-1.01,0.3-1.48,0.01c0.46,0.31,0.92,0.63,1.46,0.95c0.71,0.42,1.5,0.84,2.35,1.22
-		c1.46,0.66,2.81,1.1,3.98,1.39c-0.39-0.11-0.78-0.22-1.17-0.36c-0.03-0.01-0.06-0.02-0.09-0.04c-0.25-0.1-0.41-0.33-0.57-0.55
-		c0.16,0.22,0.32,0.44,0.57,0.55c0.03,0.01,0.06,0.02,0.09,0.04c0.39,0.13,0.78,0.24,1.17,0.36c0.02-0.08,0.04-0.17,0.06-0.26
-		c-0.69-0.25-1.39-0.54-2.1-0.87c0,0,0,0,0,0c0,0-0.01,0-0.01-0.01c-0.18-0.36-0.23-0.81-0.11-1.24c0.18-0.65,0.7-1.09,1.28-1.16
-		c-0.57,0.07-1.08,0.51-1.27,1.16c-0.12,0.44-0.07,0.88,0.11,1.25c0.71,0.33,1.41,0.63,2.1,0.88c0.22-0.97,0.44-1.94,0.67-2.91
-		c0,0,0,0,0.01,0c-0.22,0.97-0.45,1.94-0.67,2.91c0,0,0,0-0.01,0c-0.02,0.09-0.04,0.17-0.06,0.26c0.84,0.24,1.71,0.34,2.57,0.5
-		c0.61,0.14,1.21,0.27,1.8,0.35c0.01,0.01,0.03,0.01,0.04,0.01c6.81,0.9,13.49-1.31,13.49-1.31c1.59-0.53,2.78-1.06,3.24-1.28
-		c2.42-1.14,7.4-3.49,11.36-9.09c2.54-3.6,3.58-7.02,4.08-8.74c1.32-4.51,1.48-8.71,1.22-12.11c-0.66-4.62-1.43-8.2-2.02-10.64
-		c-0.46-1.89-0.91-3.52-0.89-5.91c0.02-2.08,0.39-4.15,1.11-6.22c3.02-8.69,9.97-12.71,20.65-11.95c4.86,0.35,9-2.74,10.54-7.86
-		C96.93,20.45,96.1,14.74,91.37,11.51z M20.76,94.39C20.76,94.39,20.76,94.39,20.76,94.39c0.46,0.34,0.92,0.66,1.38,0.97
-		C21.68,95.05,21.22,94.73,20.76,94.39z M25.41,94.26c-1.18-0.55-2.25-1.13-3.22-1.69c0,0,0-0.01-0.01-0.01c0,0,0,0,0,0
-		C23.15,93.13,24.23,93.71,25.41,94.26C25.41,94.26,25.41,94.26,25.41,94.26z M22.74,59.66c-3.46-1.42-5.2-5.68-3.86-9.52
-		c1.33-3.83,5.24-5.79,8.7-4.38c3.47,1.42,5.2,5.68,3.87,9.52C30.12,59.12,26.21,61.08,22.74,59.66z M39.28,79.74
-		c-1.22,3.52-4.8,5.32-7.99,4.02c-3.18-1.3-4.77-5.22-3.55-8.74c1.23-3.52,4.81-5.32,7.99-4.01C38.92,72.3,40.51,76.22,39.28,79.74z
-		 M42.51,32.03c-1.33,3.83-5.24,5.8-8.7,4.37c-3.46-1.42-5.2-5.69-3.86-9.52c1.33-3.83,5.24-5.79,8.7-4.38
-		C42.1,23.93,43.84,28.2,42.51,32.03z M61.85,20.39c-1,2.86-3.91,4.33-6.5,3.27c-2.59-1.06-3.88-4.25-2.88-7.11
-		c0.99-2.86,3.91-4.33,6.5-3.27S62.85,17.53,61.85,20.39z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/park.svg b/assets/walkbybrussels/park.svg
deleted file mode 100644
index 2d2d57d82f..0000000000
--- a/assets/walkbybrussels/park.svg
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<path class="st1" d="M86.8,75.14c0.01,0,0.02,0,0.03-0.01c1.74-0.37,3.27-0.98,4.62-1.78c2.96-1.77,5.01-4.52,6.31-8.04c0,0,0,0,0,0
-	s0.15-0.43,0.29-0.9c0.51-1.75,0.67-2.76,0.67-2.76c0.28-1.71,0.03-3.45-0.18-4.5c-0.01-0.05-0.02-0.11-0.03-0.19
-	c-0.01-0.06-0.02-0.12-0.03-0.19c-0.04-0.19-0.08-0.41-0.12-0.64c-0.02-0.08-0.03-0.15-0.05-0.24c-0.02-0.08-0.04-0.16-0.06-0.25
-	c-0.01-0.03-0.01-0.05-0.02-0.08c-0.02-0.06-0.03-0.12-0.05-0.18c-0.02-0.09-0.05-0.18-0.07-0.27c-0.04-0.14-0.08-0.29-0.12-0.43
-	c0-0.02-0.01-0.03-0.01-0.04c-0.49-1.64-1.36-3.68-3.02-5.6c-0.01-0.01-0.02-0.02-0.03-0.03c-0.12-0.13-0.24-0.26-0.36-0.4
-	c-0.02-0.02-0.04-0.04-0.06-0.06c-0.07-0.08-0.14-0.15-0.21-0.23c-0.02-0.02-0.05-0.05-0.07-0.07c-0.06-0.06-0.12-0.12-0.19-0.18
-	c-0.07-0.07-0.15-0.14-0.22-0.21c-0.06-0.06-0.13-0.12-0.19-0.17c-0.08-0.07-0.15-0.13-0.23-0.2c-0.07-0.06-0.14-0.12-0.2-0.17
-	c-0.08-0.07-0.16-0.13-0.23-0.19c-0.07-0.05-0.14-0.11-0.21-0.16c-0.08-0.06-0.16-0.12-0.24-0.18c-0.07-0.05-0.14-0.1-0.22-0.15
-	c-0.08-0.06-0.17-0.12-0.25-0.17c-0.07-0.05-0.15-0.1-0.22-0.15c-0.09-0.05-0.17-0.11-0.26-0.16c-0.08-0.04-0.15-0.09-0.23-0.14
-	c-0.09-0.05-0.18-0.1-0.27-0.15c-0.08-0.05-0.15-0.09-0.23-0.14c-0.09-0.05-0.19-0.1-0.28-0.15c-0.08-0.04-0.16-0.08-0.24-0.13
-	c-0.09-0.05-0.19-0.09-0.29-0.14c-0.08-0.03-0.16-0.08-0.24-0.11c-0.1-0.04-0.2-0.09-0.3-0.13c-0.08-0.03-0.17-0.07-0.25-0.11
-	c-0.1-0.04-0.21-0.08-0.32-0.13c-0.08-0.03-0.17-0.07-0.25-0.1c-0.11-0.04-0.22-0.07-0.33-0.12c-0.08-0.03-0.16-0.06-0.25-0.08
-	c-0.12-0.04-0.24-0.08-0.36-0.11c-0.08-0.02-0.16-0.05-0.24-0.07c-0.13-0.04-0.27-0.08-0.4-0.11c-0.07-0.02-0.13-0.03-0.2-0.05
-	c-0.2-0.05-0.41-0.1-0.61-0.15c0,0-0.01,0-0.01,0c0.04-0.07,0.09-0.14,0.14-0.2c0.14-0.19,0.27-0.38,0.36-0.58
-	c0.35-0.8,0.71-1.6,1.06-2.41c0.26-0.59,0.5-1.19,0.73-1.79c0,0,0,0,0,0c0.12-0.29,0.26-0.69,0.38-1.19
-	c0.31-1.33,0.19-2.39,0.07-3.3c-0.11-0.87-0.35-2.1-0.91-3.49l-0.1-0.23v0c-0.03-0.06-0.05-0.13-0.08-0.19
-	c-0.17-0.38-0.36-0.75-0.56-1.1c-0.6-1.06-1.32-2.01-2.16-2.84c-0.28-0.28-0.58-0.54-0.88-0.79c-0.52-0.43-1.09-0.82-1.68-1.17
-	c-0.2-0.12-0.41-0.23-0.62-0.35c-0.27-0.14-0.54-0.28-0.82-0.41c-0.21-0.1-0.39-0.18-0.51-0.31c-0.07-0.08-0.13-0.18-0.15-0.31
-	c-0.02-0.08-0.03-0.18-0.02-0.29c0.07-1.55-0.17-2.98-0.71-4.23c-0.19-0.43-0.4-0.83-0.66-1.22c-0.45-0.67-1.01-1.27-1.69-1.8
-	c-0.51-0.4-1.08-0.74-1.72-1.05c-0.22-0.1-0.42-0.21-0.6-0.32c-0.27-0.16-0.51-0.33-0.71-0.51c-0.2-0.18-0.37-0.38-0.52-0.59
-	c-0.39-0.56-0.6-1.24-0.76-2.11c-0.13-0.73-0.33-1.42-0.59-2.08c-0.2-0.5-0.43-0.97-0.7-1.43C71.4,7,70.86,6.3,70.24,5.66
-	c-0.09-0.09-0.19-0.19-0.28-0.28c-0.29-0.28-0.59-0.54-0.9-0.78c-0.42-0.33-0.87-0.63-1.33-0.9c-0.31-0.18-0.63-0.35-0.96-0.51
-	c-0.98-0.46-2.04-0.81-3.13-1.02c-0.37-0.07-0.74-0.12-1.11-0.16c-0.75-0.08-1.52-0.08-2.29-0.02c-0.54,0.04-1.07,0.13-1.6,0.24
-	c-0.35,0.08-0.69,0.17-1.03,0.28c-0.17,0.05-0.33,0.11-0.5,0.18c-0.33,0.13-0.66,0.27-0.97,0.42c-0.95,0.46-1.84,1.05-2.63,1.74
-	c-0.26,0.23-0.52,0.47-0.77,0.72c-1.96,2.01-3.22,4.67-3.32,7.52c-0.01,0.21-0.04,0.37-0.1,0.51c-0.04,0.09-0.1,0.16-0.18,0.23
-	c-0.11,0.1-0.26,0.17-0.47,0.24c-3.15,1.03-5.33,3.32-6.06,6.24c-0.06,0.23-0.11,0.47-0.15,0.71c-0.06,0.36-0.1,0.73-0.11,1.11
-	c-0.01,0.13-0.01,0.25-0.01,0.38s0,0.25,0.01,0.38c0,0.04,0,0.08,0,0.12c0,0.34-0.06,0.58-0.2,0.75c-0.12,0.14-0.3,0.24-0.56,0.28
-	c-0.09,0.02-0.18,0.03-0.28,0.03c-0.02-0.06-0.05-0.12-0.07-0.19c-0.06-0.17-0.12-0.34-0.19-0.5c-0.03-0.06-0.05-0.12-0.07-0.18
-	c-0.83-1.94-1.62-3.9-2.45-5.84c-0.5-1.16-1.02-2.32-1.57-3.46c-0.45-0.91-0.92-1.81-1.42-2.68c-0.38-0.66-0.78-1.3-1.2-1.92
-	c-0.56-0.84-1.17-1.64-1.84-2.4c-0.33-0.38-0.68-0.76-1.04-1.12c-0.54-0.54-1.12-1.06-1.73-1.55c-0.15-0.12-0.3-0.23-0.45-0.34
-	c-0.13-0.1-0.27-0.19-0.41-0.29c-0.67-0.45-1.34-0.81-2.02-1.08c-0.37-0.14-0.73-0.26-1.1-0.35c-0.24-0.06-0.49-0.11-0.74-0.15
-	c-0.37-0.06-0.74-0.08-1.1-0.09c-0.86-0.01-1.72,0.13-2.57,0.41c-1.09,0.36-2.17,0.97-3.22,1.82c-0.97,0.79-1.85,1.64-2.65,2.53
-	c-0.4,0.45-0.78,0.91-1.15,1.38c-0.24,0.31-0.48,0.63-0.71,0.95c-0.11,0.16-0.23,0.32-0.34,0.49c-0.45,0.65-0.86,1.32-1.26,2
-	c-0.9,1.54-1.68,3.14-2.41,4.77c-0.16,0.36-0.33,0.73-0.48,1.09c-0.4,0.92-0.78,1.84-1.16,2.76c-0.01,0.01-0.01,0.02-0.01,0.03
-	C7.52,21.1,7.1,22.11,6.71,23.2c-0.36,0.99-0.65,1.94-0.9,2.83c-0.06,0.13-0.11,0.27-0.15,0.41c-0.76,3.07-1.58,6.14-2.33,9.21
-	c-0.45,1.84-0.88,3.7-1.26,5.55c-0.95,4.62-1.34,9.33-0.24,14.01c0.38,1.64,0.88,3.19,1.5,4.66c0.09,0.21,0.18,0.42,0.27,0.62
-	c0.28,0.62,0.58,1.22,0.9,1.81c0.32,0.59,0.67,1.16,1.04,1.71c0.9,1.35,1.94,2.6,3.12,3.74c0.27,0.26,0.55,0.52,0.84,0.77
-	c1.54,1.34,3.3,2.52,5.3,3.53c0.3,0.15,0.59,0.29,0.89,0.42c0.6,0.26,1.21,0.48,1.84,0.68s1.25,0.36,1.89,0.5
-	c0.69,0.15,1.39,0.26,2.1,0.35v20.3H1.16v4.9h97.56v-4.9H86.8V75.14z M8.39,27.43c0.02-0.07,0.04-0.13,0.05-0.2l0,0
-	C8.43,27.3,8.41,27.37,8.39,27.43z M69.97,57.4c0,0.93-0.06,2.03,0.01,3.12c0.32,5.2,2.46,9.47,6.85,12.55
-	c1.52,1.07,3.22,1.75,5.06,2.07v19.17c-5.99,0-11.95,0-17.97,0V55.66c0.77,0.36,1.53,0.71,2.33,0.96
-	C67.36,56.97,68.53,57.11,69.97,57.4z M39,67.83c3.73-3.64,5.97-8.06,7.05-13.14c4.23,3.17,8.52,3.2,12.98,0.91v38.7H26.41V73.98
-	C31.27,73.32,35.48,71.27,39,67.83z"/>
-</svg>
diff --git a/assets/walkbybrussels/playground_black.svg b/assets/walkbybrussels/playground_black.svg
deleted file mode 100644
index 19d7ad7152..0000000000
--- a/assets/walkbybrussels/playground_black.svg
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<g>
-	<path d="M39.2,90.4c1.2-1.2,2.1-2.6,2.8-4.1c0.3-0.8,0.6-1.6,0.7-2.5c-0.8-0.1-1.6-0.2-2.3-0.2C34.9,83,29.6,81.8,24.5,80
-		c-6.6-2.2-12.3-5.1-16.6-8.2c4.9,9.2,12.6,16.6,22,21c0,0,0,0,0.1,0c0,0,0,0,0.1,0C33.3,93.2,36.5,92.4,39.2,90.4L39.2,90.4z"/>
-	<path d="M11.4,22.5c0,3.8,7.1,11.9,13.9,19.8c10.5,12,22.4,25.6,22.4,36.9c0,0.1,0,0.3,0,0.4c3,0.1,6,0,9-0.2
-		C56.2,33.2,53,23.8,41.2,3.2c0-0.1-0.1-0.2-0.1-0.3c-12,2.3-22.6,9.1-29.7,19C11.4,22.1,11.4,22.3,11.4,22.5
-		C11.4,22.5,11.4,22.5,11.4,22.5z"/>
-	<path d="M88.7,22c0.8,9.3-3.1,18.5-6.8,27.5c-3.9,7.9-6.3,16.4-7,25.2c0,0.1,0,0.1,0,0.2c7.4-3.2,14.1-7.9,19.7-13.8
-		c0.7-0.8,1.4-1.6,2.1-2.4C99.3,45.8,96.3,32.6,88.7,22z"/>
-	<path d="M12.1,69.2c0.1,0,0.1,0.1,0.2,0.1c7.4,4.7,18.6,8.8,31,10v-0.1c0-9.7-11.8-23.1-21.2-34c-3-3.1-5.9-6.5-8.4-10
-		c-2.4-3-4.3-5.8-5.4-8.2c-1.4,2.6-2.6,5.3-3.5,8c0,0.1-0.1,0.2-0.1,0.3c-0.1,0.2-0.1,0.4-0.2,0.5c-0.1,0.2-0.1,0.4-0.2,0.7
-		c0,0.1-0.1,0.2-0.1,0.3C4,37.1,4,37.4,3.9,37.8c0,0,0,0,0,0c-1,3.8-1.5,7.8-1.5,11.9c0,0.2,0,0.4,0,0.5c0,0.2,0,0.3,0,0.5
-		c0.1,3.7,0.6,7.4,1.6,11c0.1,0.1,0.2,0.2,0.3,0.4c1.5,2.3,4.1,4.7,7.7,7C12,69.2,12,69.2,12.1,69.2z"/>
-	<path d="M70.4,75.2c0-0.2,0-0.3,0-0.5c0.6-9.4,3.1-18.5,7.3-26.9c4.8-11.6,9.4-22.5,4.3-33.2C73.6,6.8,62.6,2.4,51.1,2.1
-		c-0.4,0-0.8,0-1.1,0l0,0c-1.4,0-2.7,0.1-4.1,0.2C58,23.6,60.8,35,61.3,78.8c3.1-0.5,6.2-1.2,9.2-2.2C70.4,76.1,70.4,75.7,70.4,75.2
-		z"/>
-	<path d="M56.8,84c-3.1,0.3-6.2,0.3-9.3,0.2c-0.2,1.1-0.5,2.1-0.9,3.2c-0.9,2.5-2.3,4.7-4.3,6.5c0,0-0.1,0.1-0.1,0.1c0,0,0,0,0,0
-		c-1,0.8-2.1,1.5-3.3,2c3.7,0.9,7.4,1.4,11.2,1.4c2.3,0,4.6-0.2,6.8-0.5c0-0.1,0-0.1,0-0.2c0-4.2,0-8.2,0-11.9
-		C56.8,84.5,56.8,84.3,56.8,84z"/>
-	<path d="M75.8,80.4c0.3,0.9,0.7,1.6,1.1,2.3c1,1.4,2.4,2.6,4.1,3.2c5.7-4.8,10.1-10.9,13-17.8c-5.5,4.9-11.7,8.7-18.4,11.5
-		C75.6,79.8,75.7,80.1,75.8,80.4z"/>
-	<path d="M72.4,83.9c-0.2-0.4-0.5-0.9-0.7-1.4c-0.2-0.5-0.4-1-0.5-1.5c-3.2,1.1-6.6,1.9-10,2.4c0,3.9,0,8,0,12.4
-		c5.6-1.4,10.9-3.8,15.7-7C75.4,87.9,73.7,86.4,72.4,83.9z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/streetart.svg b/assets/walkbybrussels/streetart.svg
deleted file mode 100644
index 56d7eb4fc9..0000000000
--- a/assets/walkbybrussels/streetart.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st3" d="M72.79,34.66l-3.1,2.84c-0.25,0.23-0.6,0.16-0.78-0.07l-5.58-7.15c-0.09-0.12-0.14-0.27-0.13-0.42
-		c-0.01,0.15,0.04,0.31,0.13,0.42l5.58,7.15c0.18,0.23,0.52,0.3,0.78,0.07L72.79,34.66c0.24-0.22,0.24-0.6,0.06-0.83
-		C73.03,34.07,73.03,34.44,72.79,34.66z"/>
-	<path class="st3" d="M47.92,43.19C47.92,43.2,47.92,43.2,47.92,43.19l6.69,8.57c4.21-4.4,7.98-8.6,11.05-12.32
-		c-3.07,3.71-6.84,7.92-11.05,12.31L47.92,43.19z"/>
-	<path class="st3" d="M50.85,55.61c-0.56,0.56-1.13,1.14-1.7,1.7c-0.32,0.32-0.64,0.64-0.96,0.95c-1.26,1.24-2.54,2.49-3.84,3.74
-		c-1.29,1.24-2.59,2.48-3.9,3.69c-0.3,0.29-0.61,0.57-0.92,0.86c-0.68,0.64-1.37,1.27-2.05,1.89l0,0.01
-		c-8.62,7.19-17.24,14.39-25.86,21.58c0,0.01-0.01,0.01-0.01,0.01c-0.43,0.32-0.86,0.63-1.28,0.94c-1.55,0.77-4.15,0.96-5.6-0.8
-		c-0.05-0.07-0.1-0.13-0.15-0.2C4.23,89.49,4,88.96,3.86,88.4C4,88.97,4.23,89.51,4.58,90c0.05,0.07,0.1,0.14,0.15,0.2
-		c1.4,1.74,3.81,2.1,5.6,0.8c0.57-0.29,0.99-0.65,1.28-0.94c5.32-3.94,11.27-8.75,17.36-14.01l7.58-6.73
-		c0.31-0.28,0.62-0.56,0.93-0.85c0-0.02,0-0.02,0-0.02c0.68-0.62,1.37-1.25,2.05-1.89c0.31-0.28,0.61-0.57,0.92-0.85
-		c1.31-1.22,2.61-2.45,3.9-3.69c1.29-1.24,2.57-2.49,3.84-3.74c0.32-0.32,0.64-0.64,0.96-0.95c0.58-0.57,1.14-1.13,1.7-1.7
-		c0.36-0.37,0.72-0.73,1.08-1.09l-0.01-0.01C51.57,54.89,51.21,55.25,50.85,55.61z M4.73,90.19c1.45,1.77,4.05,1.58,5.6,0.8
-		C8.54,92.29,6.13,91.93,4.73,90.19z M36.55,69.31l-7.58,6.73c-6.08,5.27-12.04,10.07-17.36,14.01c0-0.01,0.01-0.01,0.01-0.01
-		c8.62-7.19,17.23-14.38,25.86-21.58C37.17,68.75,36.86,69.03,36.55,69.31z"/>
-	<path class="st3" d="M95.13,6.33c-6.07,0.59-10.41,1.65-13.37,2.76c-3.1,1.16-4.75,2.35-5.55,3.08c0.81-0.72,2.45-1.91,5.54-3.07
-		C84.71,7.98,89.06,6.93,95.13,6.33z"/>
-	<path class="st3" d="M87.49,26.75c-2.56,2.35-5.62,3.54-8.32,4.18C81.86,30.29,84.92,29.1,87.49,26.75
-		c1.58-1.44,5.57-6.32,8.83-20.55c0,0,0,0,0,0C93.05,20.43,89.06,25.31,87.49,26.75z"/>
-	<path class="st4" d="M99.16,3.59c-0.75-0.96-1.89-1.48-3.05-1.39c-6.05,0.5-17.01,2.07-22.35,6.96c-4.32,3.96-6.41,9.52-7.38,13.33
-		c-0.83,0.1-1.61,0.47-2.26,1.06l-3.1,2.84c-0.88,0.8-1.43,1.95-1.49,3.29c-8.09,6.36-16.19,12.71-24.29,19.07
-		C24.18,59.62,13.13,70.48,2.09,81.34c-0.54,0.64-1.48,1.94-1.9,3.86c-0.45,2.08-0.22,4.96,1.47,7.24c2.75,3.7,7.35,3.02,8,2.91
-		c2.1-0.35,3.46-1.43,5.24-2.83c6.62-5.23,10.11-7.99,10.15-7.97c0,0,0,0.01-0.01,0.01c3.36-3.13,8.16-7.45,14.92-13.13
-		c9.57-8.79,20.69-19.83,28.87-29.83c1.24,0.16,2.37-0.25,3.24-1.05l3.1-2.84c0.66-0.6,1.11-1.39,1.33-2.23
-		c3.63-0.41,9.04-1.71,13.36-5.67c5.34-4.9,8.59-16.34,10.04-22.72C100.19,5.86,99.91,4.56,99.16,3.59z M50.85,55.62
-		c-0.56,0.57-1.13,1.13-1.7,1.7c-0.32,0.32-0.64,0.64-0.96,0.95c-1.27,1.25-2.55,2.5-3.84,3.74c-1.29,1.24-2.59,2.47-3.9,3.69
-		c-0.31,0.29-0.61,0.57-0.92,0.85c-0.68,0.64-1.37,1.27-2.05,1.89c0,0,0,0,0,0.02c-0.31,0.29-0.62,0.57-0.93,0.85l-7.58,6.73
-		c-6.08,5.26-12.04,10.07-17.36,14.01c-0.29,0.29-0.71,0.65-1.28,0.94c-1.79,1.3-4.21,0.94-5.6-0.8c-0.05-0.07-0.1-0.13-0.15-0.2
-		C4.23,89.51,4,88.97,3.86,88.4c0.15,0.56,0.38,1.09,0.72,1.58c0.05,0.07,0.1,0.14,0.15,0.2c1.45,1.77,4.05,1.58,5.6,0.8
-		c0.42-0.31,0.85-0.62,1.28-0.94c0-0.01,0.01-0.01,0.01-0.01c8.62-7.19,17.24-14.39,25.86-21.58l0-0.01
-		c0.68-0.62,1.36-1.25,2.05-1.89c0.31-0.29,0.62-0.57,0.92-0.86c1.31-1.22,2.61-2.45,3.9-3.69c1.31-1.25,2.58-2.5,3.84-3.74
-		c0.32-0.32,0.64-0.64,0.96-0.95c0.57-0.57,1.14-1.14,1.7-1.7c0.36-0.36,0.72-0.72,1.07-1.08l0.01,0.01
-		C51.57,54.9,51.22,55.26,50.85,55.62z M54.61,51.76l-6.69-8.57c0,0,0,0,0,0L54.61,51.76c4.21-4.4,7.98-8.6,11.05-12.32
-		C62.59,43.16,58.82,47.36,54.61,51.76z M72.79,34.66l-3.1,2.84c-0.25,0.23-0.6,0.16-0.78-0.07l-5.58-7.15
-		c-0.09-0.12-0.14-0.27-0.13-0.42c-0.01,0.15,0.04,0.3,0.13,0.42l5.58,7.15c0.18,0.22,0.52,0.3,0.78,0.07L72.79,34.66
-		c0.24-0.22,0.24-0.59,0.06-0.83C73.04,34.07,73.04,34.44,72.79,34.66z M76.21,12.17c0.8-0.72,2.45-1.91,5.55-3.08
-		c2.96-1.11,7.3-2.17,13.37-2.76C89.06,6.93,84.71,7.98,81.75,9.1C78.66,10.26,77.02,11.44,76.21,12.17z M87.49,26.75
-		c-2.57,2.35-5.63,3.54-8.32,4.18C81.86,30.29,84.92,29.1,87.49,26.75c1.57-1.43,5.56-6.31,8.82-20.55c0,0,0,0,0,0
-		C93.06,20.43,89.06,25.31,87.49,26.75z"/>
-	<path class="st4" d="M11.61,90.05c5.32-3.94,11.27-8.74,17.36-14.01l7.58-6.73c0.31-0.28,0.62-0.56,0.93-0.85
-		c-8.62,7.19-17.24,14.39-25.86,21.58C11.62,90.04,11.62,90.05,11.61,90.05z"/>
-	<path class="st4" d="M4.73,90.19c1.4,1.74,3.81,2.1,5.6,0.8C8.78,91.76,6.19,91.95,4.73,90.19z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/tree.svg b/assets/walkbybrussels/tree.svg
deleted file mode 100644
index ad76c80ee6..0000000000
--- a/assets/walkbybrussels/tree.svg
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<path class="st1" d="M77.22,32.79c2.42-8.74-3.23-17.77-12.07-19.42c-1.33-7.25-7.64-12.75-15.2-12.75c-7.56,0-13.86,5.5-15.2,12.75
-	c-7.17,1.34-12.63,7.71-12.63,15.35c0,1.37,0.19,2.74,0.56,4.08c-7.62,2.43-12.93,9.55-12.93,17.77c0,10.33,8.32,18.73,18.55,18.73
-	c3.69,0,7.2-1.15,10.29-3.33c1.96,1.24,4.09,2.04,6.28,2.59v29.93h4.4v0h5.73v0V68.55c2.19-0.55,4.33-1.34,6.29-2.59
-	c3.09,2.19,6.61,3.33,10.29,3.33c10.23,0,18.55-8.4,18.55-18.73C90.15,42.36,84.85,35.23,77.22,32.79z M59.23,16.22
-	c0,1.73,1.39,3.12,3.09,3.12c7.02,0,11.72,7.74,7.93,14.14c-0.88,1.48-0.38,3.28,0.89,4.17c-1.27-0.89-1.77-2.69-0.89-4.17
-	c3.79-6.41-0.91-14.14-7.93-14.14C60.61,19.35,59.22,17.95,59.23,16.22c-0.01-5.16-4.16-9.36-9.28-9.36c0,0,0,0,0,0
-	C55.07,6.86,59.23,11.06,59.23,16.22z M41.58,26.5c-1.21,1.22-1.21,3.2,0,4.42l1.58,1.6l-1.59-1.6
-	C40.37,29.7,40.37,27.72,41.58,26.5c1.2-1.22,3.16-1.22,4.37,0l0,0C44.74,25.29,42.79,25.29,41.58,26.5z M60.14,39l-5.12,5.17v-0.01
-	L60.14,39c0.9-0.92,2.23-1.14,3.35-0.69C62.37,37.86,61.04,38.08,60.14,39z M53.95,26.51l-4,4.04l-0.01-0.01L53.95,26.51
-	c0.9-0.92,2.23-1.14,3.34-0.69C56.18,25.37,54.85,25.6,53.95,26.51z M44.88,44.15L44.88,44.15l-5.11-5.16
-	c-1.21-1.22-3.17-1.22-4.37,0c-0.91,0.91-1.13,2.25-0.68,3.38c-0.46-1.13-0.23-2.47,0.68-3.38c1.21-1.22,3.16-1.22,4.37,0
-	L44.88,44.15z M44.88,52.97L44.88,52.97l-6.57-6.62L44.88,52.97z M44.73,61.99c-0.41-0.15-0.83-0.23-1.23-0.42
-	C43.9,61.75,44.32,61.83,44.73,61.99z M46.85,41.05v-4.81l0.01,0.01L46.85,41.05L46.85,41.05z M37.58,19.34
-	c0.85,0,1.62-0.35,2.18-0.91C39.21,19,38.43,19.35,37.58,19.34c-1.28,0-2.5,0.27-3.61,0.74C35.08,19.61,36.3,19.34,37.58,19.34z
-	 M28.31,63.04C28.31,63.04,28.31,63.04,28.31,63.04c3.71,0,6.45-1.79,8.11-3.3c0.36-0.33,0.78-0.52,1.22-0.64
-	c-0.44,0.13-0.86,0.32-1.22,0.64C34.77,61.25,32.02,63.04,28.31,63.04z M59.5,59.63c-1.38,1.1-2.91,1.85-4.48,2.42v-0.01
-	c1.57-0.57,3.1-1.32,4.47-2.42c1.02-0.82,2.39-0.85,3.48-0.2C61.88,58.79,60.52,58.81,59.5,59.63z M71.6,63.05
-	c-1.85,0-3.47-0.45-4.83-1.09C68.13,62.6,69.74,63.05,71.6,63.05c6.81,0,12.36-5.6,12.36-12.49c0-6.5-4.87-11.81-11.32-12.37
-	c-0.22-0.02-0.37-0.15-0.57-0.21c0.2,0.06,0.36,0.19,0.57,0.21c6.46,0.55,11.32,5.87,11.32,12.36
-	C83.96,57.45,78.42,63.05,71.6,63.05z"/>
-</svg>
diff --git a/assets/walkbybrussels/viewpoint.svg b/assets/walkbybrussels/viewpoint.svg
deleted file mode 100644
index a0f490e495..0000000000
--- a/assets/walkbybrussels/viewpoint.svg
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#003B8B;}
-	.st1{fill:#72B154;}
-	.st2{fill:#FDC400;}
-	.st3{fill:none;}
-	.st4{fill:#E64335;}
-	.st5{fill:#9C9B9A;}
-	.st6{fill:#020203;}
-	.st7{fill:#0081C1;}
-	.st8{clip-path:url(#SVGID_2_);}
-	.st9{fill:none;stroke:#003B8B;stroke-width:9;stroke-linecap:round;}
-	.st10{clip-path:url(#SVGID_4_);}
-	.st11{clip-path:url(#SVGID_6_);}
-	.st12{fill:#FFFFFF;}
-</style>
-<g>
-	<path class="st3" d="M32.95,71.53c-3.34-2.49-7.11-3.48-11.15-3.45c-4.58,0.04-8.73,1.39-12.22,4.6
-		c-4.08,3.74-4.17,8.97-0.23,12.86c3.49,3.44,7.79,4.62,11.68,4.69c4.81,0,8.58-0.96,11.92-3.46
-		C38.64,82.52,38.64,75.77,32.95,71.53z"/>
-	<path class="st3" d="M50.05,61.82c-1.62-0.03-2.92,1.24-2.96,2.91c-0.04,1.62,1.25,3.01,2.84,3.03c1.61,0.01,2.91-1.31,2.92-2.95
-		C52.87,63.2,51.6,61.86,50.05,61.82z"/>
-	<path class="st3" d="M89.27,71.73c-3.31-2.49-7.05-3.62-11.1-3.64c-4.04-0.02-7.81,0.96-11.15,3.44c-5.7,4.25-5.7,10.98-0.02,15.23
-		c3.31,2.49,7.05,3.46,9.56,3.47c5.5,0.01,9.25-0.94,12.57-3.38C94.9,82.63,94.96,76.03,89.27,71.73z"/>
-	<path class="st7" d="M99.31,77.82c-1.16-4.74-2.28-9.49-3.45-14.2c-3.35-13.31-6.74-26.61-10.09-39.92
-		c-0.71-2.77-2.04-5.05-4.19-6.83c-0.32-0.27-0.59-0.72-0.68-1.14c-0.74-3.27-2.72-5.5-5.54-6.81c-4.58-2.12-9.1-1.88-13.4,0.95
-		c-2.69,1.77-4.94,5.55-3.76,9.67c0.08,0.3,0.09,0.71-0.04,0.96c-1.17,2.13-1.32,4.47-1.22,6.84c0.01,0.42,0,0.85,0,1.39
-		c-4.65-1.81-9.23-1.85-13.88,0.01c0-1.13-0.02-2.12,0-3.13c0.03-1.72-0.38-3.32-1.11-4.85c-0.17-0.35-0.26-0.86-0.16-1.23
-		c1.15-4.08-0.97-7.85-3.69-9.62C33.13,6.7,28.05,6.66,23.05,9.86c-2.04,1.32-3.35,3.28-3.94,5.76c-0.12,0.48-0.42,0.98-0.78,1.29
-		c-2.11,1.78-3.42,4.03-4.11,6.77C9.93,40.69,5.67,57.7,1.29,74.69c-2.11,8.19,1.54,14.55,7.59,18.04
-		c9.17,5.3,18.43,5.07,27.31-0.93c3.71-2.51,6.13-6.13,6.73-10.82c0.22-1.69,0.12-3.44,0.13-5.15c0.01-1.75,0-3.5,0-5.49
-		c1.91,2.32,4.16,3.56,6.88,3.57c2.75,0.02,5.03-1.18,6.91-3.49c0.04,0.36,0.08,0.6,0.08,0.84c0,2.32,0.05,4.65-0.01,6.97
-		c-0.17,5.89,2.38,10.31,6.83,13.57c8.31,6.09,20.19,6.13,28.55,0.15c3.6-2.57,6.12-5.99,6.86-10.64c0.01-0.09,0.1-0.15,0.16-0.23
-		V77.82z M32.95,86.76c-3.34,2.5-7.11,3.46-11.92,3.46c-3.89-0.07-8.19-1.25-11.68-4.69c-3.94-3.88-3.84-9.12,0.23-12.86
-		c3.49-3.21,7.64-4.56,12.22-4.6c4.04-0.04,7.81,0.96,11.15,3.45C38.64,75.77,38.64,82.52,32.95,86.76z M49.94,67.76
-		c-1.59-0.02-2.89-1.4-2.84-3.03c0.04-1.67,1.34-2.94,2.96-2.91c1.55,0.03,2.81,1.38,2.8,2.99C52.84,66.45,51.55,67.77,49.94,67.76z
-		 M89.14,86.84c-3.33,2.45-7.08,3.4-12.57,3.38c-2.52-0.01-6.26-0.98-9.56-3.47c-5.68-4.25-5.68-10.98,0.02-15.23
-		c3.34-2.48,7.11-3.46,11.15-3.44c4.05,0.02,7.79,1.15,11.1,3.64C94.96,76.03,94.9,82.63,89.14,86.84z"/>
-</g>
-</svg>
diff --git a/assets/walkbybrussels/waterpoint_black.svg b/assets/walkbybrussels/waterpoint_black.svg
deleted file mode 100644
index 4bb57e98d4..0000000000
--- a/assets/walkbybrussels/waterpoint_black.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 24.2.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Laag_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 100 100" style="enable-background:new 0 0 100 100;" xml:space="preserve">
-<path d="M82.3,62.2c-0.1-3.8-1.2-7.2-2.6-10.7c-2.7-7-6.3-13.4-10.2-19.7C64.3,23.3,58.8,15,53.4,6.7c-0.7-1-1.4-2-2.5-2.5
-	c-0.5,0-1,0-1.6,0c-1.2,0.4-1.9,1.3-2.5,2.3C46,7.8,45.2,9,44.4,10.2c-6.3,9.4-12.6,18.7-18,28.6c-2.8,5-5.4,10.2-7.2,15.8
-	c-0.9,2.8-1.6,5.6-1.5,8.6c0,5.2,1.2,10.1,3.5,14.7C24.3,84.1,28.9,88.8,35,92c6.2,3.3,12.8,4.5,19.7,3.5c5-0.7,9.5-2.6,13.6-5.5
-	c6-4.2,10.2-9.9,12.5-17C81.9,69.5,82.4,65.9,82.3,62.2z M49.7,13.6c0.1-0.1,0.1-0.2,0.3-0.4c0,0,0,0,0,0
-	C49.9,13.4,49.8,13.5,49.7,13.6c-3.6,5.8-7.3,11.5-11,17.2C42.4,25.1,46.1,19.4,49.7,13.6z M34.6,84.1c-5.1-3.8-8.3-8.9-9.8-15.2
-	c-1.1-4.6-0.8-9,0.8-13.4c2.2-6.1,5.1-11.8,8.5-17.3c1-1.6,2.1-3.3,3.1-4.9c-1,1.6-2.1,3.3-3.1,4.9c-3.4,5.5-6.3,11.2-8.5,17.3
-	c-1.6,4.4-1.9,8.9-0.8,13.4C26.3,75.2,29.5,80.3,34.6,84.1c4.4,3.3,9.2,5,14.6,5.2C43.8,89.1,39,87.4,34.6,84.1z"/>
-</svg>
diff --git a/clean.sh b/clean.sh
deleted file mode 100755
index 08cf074d97..0000000000
--- a/clean.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/bash
-rm *.js
-rm Logic/*.js
-rm Logic/*.js
-rm Logic/*/*.js
-rm Logic/*/*/*.js
-rm UI/*.js
-rm UI/*/*.js
-rm UI/*/*/*.js
-rm Customizations/*.js
-rm Customizations/*/*.js
-rm Customizations/*/*/*.js
-
-rm *.webmanifest
-rm q*.html
-rm assets/generated/*
-
-for f in ./*.html; do
-    if [[ "$f" == "./index.html" ]] || [[ "$f" == "./land.html" ]] || [[ "$f" == "./test.html" ]] || [[ "$f" == "./preferences.html" ]] || [[ "$f" == "./customGenerator.html" ]]
-    then
-        echo "Not removing $f"
-    else
-        rm $f
-    fi
-done
\ No newline at end of file
diff --git a/createLayouts.ts b/createLayouts.ts
index 36560c9954..55db89ad5e 100644
--- a/createLayouts.ts
+++ b/createLayouts.ts
@@ -1,5 +1,5 @@
-
 import {UIElement} from "./UI/UIElement";
+// We HAVE to mark this while importing
 UIElement.runningFromConsole = true;
 import {AllKnownLayouts} from "./Customizations/AllKnownLayouts";
 import {Layout} from "./Customizations/Layout";
diff --git a/customGenerator.html b/customGenerator.html
index e012f42080..65daad9804 100644
--- a/customGenerator.html
+++ b/customGenerator.html
@@ -40,19 +40,7 @@
 </head>
 <body>
 <div id="maindiv">
-    <h1>Custom theme generator</h1>
-
-    Welcome to the custom theme creator.<br/>
-
-    In order to use this theme generator, you need at least 500 changesets.<br/>
-
-    As the spirit of mapcomplete is to not have <b>any</b> kind of hosted backend, the custom themes are encoded in the
-    URL:
-    the full configuration is saved in a JSON, which is base64-encoded and appended to the hash of the URL.<br/>
-
-    This means that <b>closing this page removes your theme</b>.</br>
-
-    <div id="loggedIn">'loggedIn' not attached</div>
+    <h1>Create your own theme</h1>
     <div id="layoutCreator"></div>
 </div>
 <div id="preview">'preview' not attached</div>
diff --git a/customGenerator.ts b/customGenerator.ts
index 0e657379bb..8ec6f50e17 100644
--- a/customGenerator.ts
+++ b/customGenerator.ts
@@ -1,18 +1,12 @@
 import {OsmConnection, UserDetails} from "./Logic/Osm/OsmConnection";
-import {UIEventSource} from "./UI/UIEventSource";
 import {VariableUiElement} from "./UI/Base/VariableUIElement";
-import {Preview, ThemeGenerator} from "./themeGenerator";
+import {UIEventSource} from "./Logic/UIEventSource";
+import {ThemeGenerator} from "./UI/CustomThemeGenerator/ThemeGenerator";
+import {Preview} from "./UI/CustomThemeGenerator/Preview";
 
 const connection = new OsmConnection(true, new UIEventSource<string>(undefined), false);
 connection.AttemptLogin();
 
-new VariableUiElement(connection.userDetails.map<string>((userdetails : UserDetails) => {
-    if(userdetails.loggedIn){
-        return "Logged in as "+userdetails.name
-    }else{
-        return "Not logged in"
-    }
-})).AttachTo("loggedIn").onClick(() => connection.LogOut());
 
 const themeGenerator = new ThemeGenerator(connection, window.location.hash?.substr(1));
 themeGenerator.AttachTo("layoutCreator")
diff --git a/deploy.sh b/deploy.sh
index 4799663522..cc8a8db926 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -9,3 +9,29 @@ cd /home/pietervdvn/git/pietervdvn.github.io/MapComplete/
 git add .
 git commit -m "New mapcomplete version"
 git push
+
+
+# clean up the mess we made
+ # rm *.js
+ # rm Logic/*.js
+ # rm Logic/*.js
+ # rm Logic/*/*.js
+ # rm Logic/*/*/*.js
+ # rm UI/*.js
+ # rm UI/*/*.js
+ # rm UI/*/*/*.js
+ # rm Customizations/*.js
+ # rm Customizations/*/*.js
+ # rm Customizations/*/*/*.js
+
+rm *.webmanifest
+rm assets/generated/*
+
+for f in ./*.html; do
+    if [[ "$f" == "./index.html" ]] || [[ "$f" == "./land.html" ]] || [[ "$f" == "./test.html" ]] || [[ "$f" == "./preferences.html" ]] || [[ "$f" == "./customGenerator.html" ]]
+    then
+        echo "Not removing $f"
+    else
+        rm $f
+    fi
+done
\ No newline at end of file
diff --git a/docs/Create a theme.md b/docs/Create a theme.md
deleted file mode 100644
index 778b98a2bb..0000000000
--- a/docs/Create a theme.md	
+++ /dev/null
@@ -1,14 +0,0 @@
-# Create a theme
-
-
-
-A _layer_ is a set of features of a single kind, e.g. 'bookcases'.
-A _layout_ is a set of layers, e.g. 'bookcases' + 'nature reserves'. They are shown together with some text on the left. They can be switched with the query parameter 'layout' in the url (thus by going to 'index.html?layout=bookcases')
-
-If you want to make your own version of MapComplete, you create your own layout
-
-- Clone the repo
-- Build it
-- Go into 'Customazations/Layouts' and copy a file there (e.g. bookcases)
-- Change the text and layer selection
-- Create you layers
\ No newline at end of file
diff --git a/index.ts b/index.ts
index a562dde825..eea940b360 100644
--- a/index.ts
+++ b/index.ts
@@ -8,7 +8,6 @@ import {SearchAndGo} from "./UI/SearchAndGo";
 import {AllKnownLayouts} from "./Customizations/AllKnownLayouts";
 import {Layout} from "./Customizations/Layout";
 import {FixedUiElement} from "./UI/Base/FixedUiElement";
-import {QueryParameters} from "./Logic/QueryParameters";
 import {InitUiElements} from "./InitUiElements";
 import {StrayClickHandler} from "./Logic/Leaflet/StrayClickHandler";
 import {GeoLocationHandler} from "./Logic/Leaflet/GeoLocationHandler";
@@ -19,6 +18,7 @@ import {TagRendering} from "./Customizations/TagRendering";
 import {Img} from "./UI/Img";
 import Combine from "./UI/Base/Combine";
 import {CustomLayoutFromJSON} from "./Customizations/JSON/CustomLayoutFromJSON";
+import {QueryParameters} from "./Logic/Web/QueryParameters";
 
 
 // --------------------- Special actions based on the parameters -----------------
diff --git a/package.json b/package.json
index 5dfe76da60..084ca8c599 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mapcomplete",
-  "version": "0.0.1",
+  "version": "0.0.5",
   "description": "A small website to edit OSM easily",
   "main": "index.js",
   "staticFiles": {
diff --git a/preferences.ts b/preferences.ts
index 18e879a257..f6f46d53c7 100644
--- a/preferences.ts
+++ b/preferences.ts
@@ -1,7 +1,6 @@
 import {OsmConnection} from "./Logic/Osm/OsmConnection";
 import {VerticalCombine} from "./UI/Base/VerticalCombine";
 import Combine from "./UI/Base/Combine";
-import {UIEventSource} from "./UI/UIEventSource";
 import {SubtleButton} from "./UI/Base/SubtleButton";
 import {Button} from "./UI/Base/Button";
 import {VariableUiElement} from "./UI/Base/VariableUIElement";
@@ -9,6 +8,7 @@ import {All} from "./Customizations/Layouts/All";
 import {TextField} from "./UI/Input/TextField";
 import {FixedUiElement} from "./UI/Base/FixedUiElement";
 import {UIElement} from "./UI/UIElement";
+import {UIEventSource} from "./Logic/UIEventSource";
 
 
 const connection = new OsmConnection(false, new UIEventSource<string>(undefined));
diff --git a/test.ts b/test.ts
index 8abf879d69..e69de29bb2 100644
--- a/test.ts
+++ b/test.ts
@@ -1,11 +0,0 @@
-import {State} from "./State";
-import Cyclofix from "./Customizations/Layouts/Cyclofix";
-import {CustomLayersPanel} from "./Logic/CustomLayersPanel";
-
-State.state= new State(new Cyclofix());
-
-new CustomLayersPanel().AttachTo("maindiv");
-
-State.state.osmConnection.GetPreference("mapcomplete-custom-layer-count").addCallback((count) => console.log("Count: ", count))
-    
-State.state.favourteLayers.addCallback(console.log)
\ No newline at end of file