diff --git a/Customizations/JSON/FromJSON.ts b/Customizations/JSON/FromJSON.ts
index 48aa3403c..d2952f4e4 100644
--- a/Customizations/JSON/FromJSON.ts
+++ b/Customizations/JSON/FromJSON.ts
@@ -264,7 +264,18 @@ export class FromJSON {
         const width = FromJSON.TagRenderingWithDefault(json.width, "layerwidth", "10");
 
         let tagRenderingDefs = json.tagRenderings ?? [];
-        if (tagRenderingDefs.indexOf("images") < 0) {
+        let hasImageElement = false;
+        for (const tagRenderingDef of tagRenderingDefs) {
+            if (typeof tagRenderingDef !== "string") {
+                continue;
+            }
+            let str = tagRenderingDef as string;
+            if(tagRenderingDef.indexOf("images") >= 0 || str.indexOf("pictures") >= 0){
+                hasImageElement = true;
+                break;
+            }
+        }
+        if (!hasImageElement) {
             tagRenderingDefs = ["images", ...tagRenderingDefs];
         }
         let tagRenderings = tagRenderingDefs.map(FromJSON.TagRendering);
diff --git a/Customizations/Layouts/Groen.ts b/Customizations/Layouts/Groen.ts
index 5f27bb148..97b92b887 100644
--- a/Customizations/Layouts/Groen.ts
+++ b/Customizations/Layouts/Groen.ts
@@ -14,7 +14,8 @@ export class Groen extends Layout {
             50.8435,
             4.3688,
             "\n" +
-            "<img src='./assets/themes/buurtnatuur/groen_logo.svg' alt='logo-groen' class='logo'> <br />" +
+            
+            "<img style='float:right;margin: 1em;width: 10em;height: auto;' src='./assets/themes/buurtnatuur/groen_logo.svg' alt='logo-groen' class='logo'> <br />" +
             "<h3>Breng jouw buurtnatuur in kaart</h3>" +
             "<b>Natuur maakt gelukkig.</b> Aan de hand van deze website willen we de natuur dicht bij ons beter inventariseren. Met als doel meer mensen te laten genieten van toegankelijke natuur én te strijden voor meer natuur in onze buurten. \n" +
             "<ul>" +
diff --git a/Customizations/Questions/WikipediaLink.ts b/Customizations/Questions/WikipediaLink.ts
index f230b8729..a3570696f 100644
--- a/Customizations/Questions/WikipediaLink.ts
+++ b/Customizations/Questions/WikipediaLink.ts
@@ -32,10 +32,12 @@ export class WikipediaLink extends TagRenderingOptions {
             key: "wikipedia",
             template: "$$$",
             renderTemplate:
-                "<span class='wikipedialink'>" +
+                "<span style='position: absolute;right: 24px;width: 24px;height: 24px;padding-right: 12px;'>" +
                 "<a href='{wikipedia}' target='_blank'>" +
-                "<img width='64px' src='./assets/wikipedia.svg' alt='wikipedia'>" +
+                "<img style='width: 24px;height: 24px;' src='./assets/wikipedia.svg' alt='wikipedia'>" +
                 "</a></span>",
+
+
             placeholder: ""
 
         },
diff --git a/Customizations/TagRendering.ts b/Customizations/TagRendering.ts
index 644474b52..34c081738 100644
--- a/Customizations/TagRendering.ts
+++ b/Customizations/TagRendering.ts
@@ -172,23 +172,24 @@ TagRendering extends UIElement implements TagDependantUIElement {
 
         this._editButton = new FixedUiElement("");
         if (this._question !== undefined) {
-            this._editButton = new FixedUiElement("<img class='editbutton' src='./assets/pencil.svg' alt='edit'>")
+            this._editButton = new FixedUiElement(
+                "<img style='width: 1.3em;height: 1.3em;padding: 0.5em;border-radius: 0.65em;border: solid black 1px;font-size: medium;float: right;' " +
+                "src='./assets/pencil.svg' alt='edit'>")
                 .onClick(() => {
                     self._editMode.setData(true);
                     self._questionElement.GetValue().setData(self.CurrentValue());
                 });
         }
 
-
         const cancelContents = this._editMode.map((isEditing) => {
             if (isEditing) {
-                return "<span class='skip-button'>"+Translations.t.general.cancel.R()+"</span>";
+                return "<span class='skip-button'>" + Translations.t.general.cancel.R() + "</span>";
             } else {
-                return "<span class='skip-button'>"+Translations.t.general.skip.R()+"</span>";
+                return "<span class='skip-button'>" + Translations.t.general.skip.R() + "</span>";
             }
         }, [Locale.language]);
         // And at last, set up the skip button
-        this._skipButton = new VariableUiElement(cancelContents).onClick(cancel)    ;
+        this._skipButton = new VariableUiElement(cancelContents).onClick(cancel);
     }
 
 
diff --git a/InitUiElements.ts b/InitUiElements.ts
index f3d905929..fbe3a8266 100644
--- a/InitUiElements.ts
+++ b/InitUiElements.ts
@@ -59,17 +59,34 @@ export class InitUiElements {
             tabs.push({header: `<img src='./assets/share.svg'>`, content: new ShareScreen()});
         }
 
-        if (State.state.featureSwitchMoreQuests.data){
-            
+        if (State.state.featureSwitchMoreQuests.data) {
+
             tabs.push({
-                header: `<img src='./assets/add.svg'>`
-                , content: new MoreScreen()
+                header: `<img src='./assets/add.svg'>`,
+                content: new VariableUiElement(State.state.osmConnection.userDetails.map(userdetails => {
+                    if(userdetails.csCount < State.userJourney.moreScreenUnlock){
+                        return "";
+                    }
+                    return new MoreScreen().Render()
+                }, [Locale.language]))
             });
         }
 
 
-        const fullOptions = new TabbedComponent(tabs, State.state.welcomeMessageOpenedTab);
+        tabs.push({
+                header: `<img src='./assets/help.svg'>`,
+                content: new VariableUiElement(State.state.osmConnection.userDetails.map(userdetails => {
+                    if (userdetails.csCount < State.userJourney.mapCompleteHelpUnlock) {
+                        return ""
+                    }
+                    return Translations.t.general.aboutMapcomplete.Render();
+                }, [Locale.language]))
+            }
+        );
 
+
+        const fullOptions = new TabbedComponent(tabs, State.state.welcomeMessageOpenedTab);
+        fullOptions.ListenTo(State.state.osmConnection.userDetails);
         return fullOptions;
 
     }
diff --git a/Logic/Osm/OsmConnection.ts b/Logic/Osm/OsmConnection.ts
index 525eca479..9ece8f697 100644
--- a/Logic/Osm/OsmConnection.ts
+++ b/Logic/Osm/OsmConnection.ts
@@ -117,6 +117,8 @@ export class OsmConnection {
     public LogOut() {
         this.auth.logout();
         this.userDetails.data.loggedIn = false;
+        this.userDetails.data.csCount = 0;
+        this.userDetails.data.name = "";
         this.userDetails.ping();
         console.log("Logged out")
     }
diff --git a/State.ts b/State.ts
index 7cd622e00..78f33e929 100644
--- a/State.ts
+++ b/State.ts
@@ -23,15 +23,19 @@ export class State {
     // The singleton of the global state
     public static state: State;
     
-    public static vNumber = "0.0.7e Fixing all the bugs";
+    public static vNumber = "0.0.7f";
     
     // The user journey states thresholds when a new feature gets unlocked
     public static userJourney = {
+        moreScreenUnlock: 5,
         personalLayoutUnlock: 20,
         tagsVisibleAt: 100,
+        mapCompleteHelpUnlock: 200,
         tagsVisibleAndWikiLinked: 150,
         themeGeneratorReadOnlyUnlock: 200,
-        themeGeneratorFullUnlock: 500,
+        themeGeneratorFullUnlock: 500, 
+
+
     };
 
     public static runningFromConsole: boolean = false; 
diff --git a/UI/FullScreenMessageBoxHandler.ts b/UI/FullScreenMessageBoxHandler.ts
index d4685a266..c1cb34bbb 100644
--- a/UI/FullScreenMessageBoxHandler.ts
+++ b/UI/FullScreenMessageBoxHandler.ts
@@ -36,7 +36,7 @@ export class FullScreenMessageBox extends UIElement {
             window.onhashchange = function () {
                 if (location.hash === "") {
                     // No more element: back to the map!
-                    self._uielement.setData(undefined);
+                    self._uielement?.setData(undefined);
                     onClear();
                 }
             }
@@ -58,7 +58,7 @@ export class FullScreenMessageBox extends UIElement {
         if (this._uielement === undefined) {
             return "";
         }
-        return new Combine([this._uielement, this.returnToTheMap]).SetStyle("").Render();
+        return new Combine([this._uielement, this.returnToTheMap]).Render();
     }
 
 
diff --git a/UI/i18n/Translations.ts b/UI/i18n/Translations.ts
index e9a6a0379..7249c5335 100644
--- a/UI/i18n/Translations.ts
+++ b/UI/i18n/Translations.ts
@@ -1148,11 +1148,11 @@ export default class Translations {
             },
             morescreen: {
                 intro: new T({
-                    en: "<h3>More quests</h3>Do you enjoy collecting geodata? <br/>There are more layers available.",
+                    en: "<h3>More quests</h3>Do you enjoy collecting geodata? <br/>There are more themes available.",
                     ca: "<h3>Més peticions</h3>T\'agrada captar dades? <br/>Hi ha més capes disponibles.",
                     es: "<h3>Más peticiones</h3>Te gusta captar datos? <br/>Hay más capas disponibles.",
                     fr: "<h3>Plus de thème </h3>Vous aimez collecter des données? <br/>Il y a plus de thèmes disponible.",
-                    nl: "<h3>Meer thema's</h3>Vind je het leuk om geodata te verzamelen? <br/> Hier vind je meer opties.",
+                    nl: "<h3>Meer thema's</h3>Vind je het leuk om geodata te verzamelen? <br/> Hier vind je meer kaartthemas.",
                     gl: "<h3>Máis tarefas</h3>Góstache captar datos? <br/>Hai máis capas dispoñíbeis."
                 }),
                 
@@ -1232,7 +1232,40 @@ export default class Translations {
                 en: "<h3>Custom themes</h3>These are previously visited user-generated themes.",
                 nl: "<h3>Onofficiële themea's</h3>Je bezocht deze thema's gemaakt door andere OpenStreetMappers eerder",
                 gl: "<h3>Temas personalizados</h3>Estes son temas xerados por usuarios previamente visitados."
-            }),
+            }), aboutMapcomplete: new T({
+                en:"<h3>About MapComplete</h3>" +
+                    "<p>MapComplete is an OpenStreetMap editor that is meant to help everyone to easily add information on a <b>single theme.</b></p>" +
+                    "<p>Only features relevant to a single theme are shown with a few predefined questions, in order to keep things <b>simple and extremly user-friendly</b>." +
+                    "The theme maintainer can also choose a language for the interface, choose to disable elements or even to embed it into a different website without any UI-element at all.</p>" + 
+                  
+                    "<p>However, another important part of MapComplete is to always <b>offer the next step</b> to learn more about OpenStreetMap:" +
+                    "<ul>" +
+                    "<li>An iframe without UI-elements will link to a full-screen version</li>" +
+                    "<li>The fullscreen version offers information about OpenStreetMap</li>" +
+                    "<li>If you're not logged in, you're asked to log in</li>" +
+                    "<li>If you answered a single question, you are allowed to add points</li>" +
+                    "<li>At a certain point, the actual added tags appear which later get linked to the wiki...</li>" +
+                    "</ul></p>" +
+                    "<p>Do you notice an issue with MapComplete? Do you have a feature request? Do you want to help translating? " +
+                    "Head over to <a href='https://github.com/pietervdvn/MapComplete' target='_blank'>the source code</a> or <a href='https://github.com/pietervdvn/MapComplete/issues' target='_blank'>issue tracker.</a></p>",
+                nl:"<h3>Over MapComplete</h3>" +
+                    "<p>MapComplete is een OpenStreetMap-editor om eenvoudig informatie toe te voegen over <b>één enkel onderwerp</b>.</p>" +
+                    "<p>Om de editor zo <b>simpel en gebruiksvriendelijk mogelijk</b> te houden, worden enkel objecten relevant voor het thema getoond." +
+                    "Voor deze objecten kunnen dan vragen beantwoord worden, of men kan een nieuw punt van dit thema toevoegen." +
+                    "De maker van het thema kan er ook voor opteren om een aantal elementen van de gebruikersinterface uit te schakelen of de taal ervan in te stellen.</p>" +
+
+                    "<p>Een ander belangrijk aspect is om bezoekers stap voor stap meer te leren over OpenStreetMap:" +
+                    "<ul>" +
+                    "<li>Een iframe zonder verdere uitleg linkt naar de volledige versie van MapComplete</li>" +
+                    "<li>De volledige versie heeft uitleg over OpenStreetMap</li>" +
+                    "<li>Als je niet aangemeld bent, wordt er je gevraagd dit te doen</li>" +
+                    "<li>Als je minstens één vraag hebt beantwoord, kan je punten gaan toevoegen.</li>" +
+                    "<li>Heb je genoeg changesets, dan verschijnen de tags die wat later doorlinken naar de wiki</li>" +
+                    "</ul></p>" +
+                    "<p>Merk je een bug of wil je een extra feature? Wil je helpen vertalen? Bezoek dan de <a href='https://github.com/pietervdvn/MapComplete' target='_blank'>broncode</a> en <a href='https://github.com/pietervdvn/MapComplete/issues' target='_blank'>issue tracker</a></p>",
+
+            })
+
 
         },
         favourite: {
diff --git a/aed.html b/aed.html
new file mode 100644
index 000000000..8bcb9a866
--- /dev/null
+++ b/aed.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./aed.webmanifest">
+    <link rel="icon" href="./assets/themes/aed/aed.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="./assets/add.svg">
+    <meta property="og:title" content="Open AED Map">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/themes/aed/aed.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/aed.webmanifest b/aed.webmanifest
new file mode 100644
index 000000000..d45f540cb
--- /dev/null
+++ b/aed.webmanifest
@@ -0,0 +1 @@
+{"name":"aed","short_name":"Open AED Map","start_url":"/MapComplete/aed.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/themes_aed_aed72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/themes_aed_aed96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/themes_aed_aed120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/themes_aed_aed128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/themes_aed_aed144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/themes_aed_aed152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/themes_aed_aed180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/themes_aed_aed192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/themes_aed_aed384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/themes_aed_aed512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/themes/aed/aed.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/artworks.html b/artworks.html
new file mode 100644
index 000000000..7a854949d
--- /dev/null
+++ b/artworks.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./artworks.webmanifest">
+    <link rel="icon" href="./assets/themes/artwork/artwork.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="./assets/add.svg">
+    <meta property="og:title" content="Open Artwork Map">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/themes/artwork/artwork.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/artworks.webmanifest b/artworks.webmanifest
new file mode 100644
index 000000000..0132fb143
--- /dev/null
+++ b/artworks.webmanifest
@@ -0,0 +1 @@
+{"name":"artworks","short_name":"Open Artwork Map","start_url":"/MapComplete/artworks.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/themes_artwork_artwork72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/themes_artwork_artwork96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/themes_artwork_artwork120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/themes_artwork_artwork128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/themes_artwork_artwork144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/themes_artwork_artwork152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/themes_artwork_artwork180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/themes_artwork_artwork192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/themes_artwork_artwork384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/themes_artwork_artwork512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/themes/artwork/artwork.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/assets/generated/bike_logo120.png b/assets/generated/bike_logo120.png
new file mode 100644
index 000000000..cc0fd88bf
Binary files /dev/null and b/assets/generated/bike_logo120.png differ
diff --git a/assets/generated/bike_logo128.png b/assets/generated/bike_logo128.png
new file mode 100644
index 000000000..220793ae1
Binary files /dev/null and b/assets/generated/bike_logo128.png differ
diff --git a/assets/generated/bike_logo144.png b/assets/generated/bike_logo144.png
new file mode 100644
index 000000000..0f1100b25
Binary files /dev/null and b/assets/generated/bike_logo144.png differ
diff --git a/assets/generated/bike_logo152.png b/assets/generated/bike_logo152.png
new file mode 100644
index 000000000..98d9486bb
Binary files /dev/null and b/assets/generated/bike_logo152.png differ
diff --git a/assets/generated/bike_logo180.png b/assets/generated/bike_logo180.png
new file mode 100644
index 000000000..68553621d
Binary files /dev/null and b/assets/generated/bike_logo180.png differ
diff --git a/assets/generated/bike_logo192.png b/assets/generated/bike_logo192.png
new file mode 100644
index 000000000..57456a3c7
Binary files /dev/null and b/assets/generated/bike_logo192.png differ
diff --git a/assets/generated/bike_logo384.png b/assets/generated/bike_logo384.png
new file mode 100644
index 000000000..7cdd7bf81
Binary files /dev/null and b/assets/generated/bike_logo384.png differ
diff --git a/assets/generated/bike_logo512.png b/assets/generated/bike_logo512.png
new file mode 100644
index 000000000..e46bf58b6
Binary files /dev/null and b/assets/generated/bike_logo512.png differ
diff --git a/assets/generated/bike_logo72.png b/assets/generated/bike_logo72.png
new file mode 100644
index 000000000..fdd9cb17c
Binary files /dev/null and b/assets/generated/bike_logo72.png differ
diff --git a/assets/generated/bike_logo96.png b/assets/generated/bike_logo96.png
new file mode 100644
index 000000000..750e5980e
Binary files /dev/null and b/assets/generated/bike_logo96.png differ
diff --git a/assets/generated/bug120.png b/assets/generated/bug120.png
new file mode 100644
index 000000000..1ade005b4
Binary files /dev/null and b/assets/generated/bug120.png differ
diff --git a/assets/generated/bug128.png b/assets/generated/bug128.png
new file mode 100644
index 000000000..67714ac06
Binary files /dev/null and b/assets/generated/bug128.png differ
diff --git a/assets/generated/bug144.png b/assets/generated/bug144.png
new file mode 100644
index 000000000..6b0fd460b
Binary files /dev/null and b/assets/generated/bug144.png differ
diff --git a/assets/generated/bug152.png b/assets/generated/bug152.png
new file mode 100644
index 000000000..eccb11bd9
Binary files /dev/null and b/assets/generated/bug152.png differ
diff --git a/assets/generated/bug180.png b/assets/generated/bug180.png
new file mode 100644
index 000000000..a6231cd11
Binary files /dev/null and b/assets/generated/bug180.png differ
diff --git a/assets/generated/bug192.png b/assets/generated/bug192.png
new file mode 100644
index 000000000..3fa9a9233
Binary files /dev/null and b/assets/generated/bug192.png differ
diff --git a/assets/generated/bug384.png b/assets/generated/bug384.png
new file mode 100644
index 000000000..86af3a8d5
Binary files /dev/null and b/assets/generated/bug384.png differ
diff --git a/assets/generated/bug512.png b/assets/generated/bug512.png
new file mode 100644
index 000000000..a40db7f84
Binary files /dev/null and b/assets/generated/bug512.png differ
diff --git a/assets/generated/bug72.png b/assets/generated/bug72.png
new file mode 100644
index 000000000..d69acb419
Binary files /dev/null and b/assets/generated/bug72.png differ
diff --git a/assets/generated/bug96.png b/assets/generated/bug96.png
new file mode 100644
index 000000000..c9cff5c11
Binary files /dev/null and b/assets/generated/bug96.png differ
diff --git a/assets/generated/layers_bird_hide_birdhide120.png b/assets/generated/layers_bird_hide_birdhide120.png
new file mode 100644
index 000000000..05c4682e2
Binary files /dev/null and b/assets/generated/layers_bird_hide_birdhide120.png differ
diff --git a/assets/generated/layers_bird_hide_birdhide128.png b/assets/generated/layers_bird_hide_birdhide128.png
new file mode 100644
index 000000000..e0a34023a
Binary files /dev/null and b/assets/generated/layers_bird_hide_birdhide128.png differ
diff --git a/assets/generated/layers_bird_hide_birdhide144.png b/assets/generated/layers_bird_hide_birdhide144.png
new file mode 100644
index 000000000..2d39d1cce
Binary files /dev/null and b/assets/generated/layers_bird_hide_birdhide144.png differ
diff --git a/assets/generated/layers_bird_hide_birdhide152.png b/assets/generated/layers_bird_hide_birdhide152.png
new file mode 100644
index 000000000..ec82dea2b
Binary files /dev/null and b/assets/generated/layers_bird_hide_birdhide152.png differ
diff --git a/assets/generated/layers_bird_hide_birdhide180.png b/assets/generated/layers_bird_hide_birdhide180.png
new file mode 100644
index 000000000..0529d0eaa
Binary files /dev/null and b/assets/generated/layers_bird_hide_birdhide180.png differ
diff --git a/assets/generated/layers_bird_hide_birdhide192.png b/assets/generated/layers_bird_hide_birdhide192.png
new file mode 100644
index 000000000..d561ea6b4
Binary files /dev/null and b/assets/generated/layers_bird_hide_birdhide192.png differ
diff --git a/assets/generated/layers_bird_hide_birdhide384.png b/assets/generated/layers_bird_hide_birdhide384.png
new file mode 100644
index 000000000..d99411f0e
Binary files /dev/null and b/assets/generated/layers_bird_hide_birdhide384.png differ
diff --git a/assets/generated/layers_bird_hide_birdhide512.png b/assets/generated/layers_bird_hide_birdhide512.png
new file mode 100644
index 000000000..de2996fc9
Binary files /dev/null and b/assets/generated/layers_bird_hide_birdhide512.png differ
diff --git a/assets/generated/layers_bird_hide_birdhide72.png b/assets/generated/layers_bird_hide_birdhide72.png
new file mode 100644
index 000000000..cfbec1112
Binary files /dev/null and b/assets/generated/layers_bird_hide_birdhide72.png differ
diff --git a/assets/generated/layers_bird_hide_birdhide96.png b/assets/generated/layers_bird_hide_birdhide96.png
new file mode 100644
index 000000000..afd78e465
Binary files /dev/null and b/assets/generated/layers_bird_hide_birdhide96.png differ
diff --git a/assets/generated/layers_ghost_bike_ghost_bike120.png b/assets/generated/layers_ghost_bike_ghost_bike120.png
new file mode 100644
index 000000000..1e0aa449d
Binary files /dev/null and b/assets/generated/layers_ghost_bike_ghost_bike120.png differ
diff --git a/assets/generated/layers_ghost_bike_ghost_bike128.png b/assets/generated/layers_ghost_bike_ghost_bike128.png
new file mode 100644
index 000000000..f4fffed7f
Binary files /dev/null and b/assets/generated/layers_ghost_bike_ghost_bike128.png differ
diff --git a/assets/generated/layers_ghost_bike_ghost_bike144.png b/assets/generated/layers_ghost_bike_ghost_bike144.png
new file mode 100644
index 000000000..017d590c9
Binary files /dev/null and b/assets/generated/layers_ghost_bike_ghost_bike144.png differ
diff --git a/assets/generated/layers_ghost_bike_ghost_bike152.png b/assets/generated/layers_ghost_bike_ghost_bike152.png
new file mode 100644
index 000000000..3c3412cd9
Binary files /dev/null and b/assets/generated/layers_ghost_bike_ghost_bike152.png differ
diff --git a/assets/generated/layers_ghost_bike_ghost_bike180.png b/assets/generated/layers_ghost_bike_ghost_bike180.png
new file mode 100644
index 000000000..1cb261329
Binary files /dev/null and b/assets/generated/layers_ghost_bike_ghost_bike180.png differ
diff --git a/assets/generated/layers_ghost_bike_ghost_bike192.png b/assets/generated/layers_ghost_bike_ghost_bike192.png
new file mode 100644
index 000000000..e06360e7b
Binary files /dev/null and b/assets/generated/layers_ghost_bike_ghost_bike192.png differ
diff --git a/assets/generated/layers_ghost_bike_ghost_bike384.png b/assets/generated/layers_ghost_bike_ghost_bike384.png
new file mode 100644
index 000000000..ca86d3772
Binary files /dev/null and b/assets/generated/layers_ghost_bike_ghost_bike384.png differ
diff --git a/assets/generated/layers_ghost_bike_ghost_bike512.png b/assets/generated/layers_ghost_bike_ghost_bike512.png
new file mode 100644
index 000000000..baa00e841
Binary files /dev/null and b/assets/generated/layers_ghost_bike_ghost_bike512.png differ
diff --git a/assets/generated/layers_ghost_bike_ghost_bike72.png b/assets/generated/layers_ghost_bike_ghost_bike72.png
new file mode 100644
index 000000000..9cc72114c
Binary files /dev/null and b/assets/generated/layers_ghost_bike_ghost_bike72.png differ
diff --git a/assets/generated/layers_ghost_bike_ghost_bike96.png b/assets/generated/layers_ghost_bike_ghost_bike96.png
new file mode 100644
index 000000000..1fc22e949
Binary files /dev/null and b/assets/generated/layers_ghost_bike_ghost_bike96.png differ
diff --git a/assets/generated/logo120.png b/assets/generated/logo120.png
new file mode 100644
index 000000000..6cb318da3
Binary files /dev/null and b/assets/generated/logo120.png differ
diff --git a/assets/generated/logo128.png b/assets/generated/logo128.png
new file mode 100644
index 000000000..c66222fbd
Binary files /dev/null and b/assets/generated/logo128.png differ
diff --git a/assets/generated/logo144.png b/assets/generated/logo144.png
new file mode 100644
index 000000000..73cef7178
Binary files /dev/null and b/assets/generated/logo144.png differ
diff --git a/assets/generated/logo152.png b/assets/generated/logo152.png
new file mode 100644
index 000000000..39016a2df
Binary files /dev/null and b/assets/generated/logo152.png differ
diff --git a/assets/generated/logo180.png b/assets/generated/logo180.png
new file mode 100644
index 000000000..992310ce8
Binary files /dev/null and b/assets/generated/logo180.png differ
diff --git a/assets/generated/logo192.png b/assets/generated/logo192.png
new file mode 100644
index 000000000..c201ff8f6
Binary files /dev/null and b/assets/generated/logo192.png differ
diff --git a/assets/generated/logo384.png b/assets/generated/logo384.png
new file mode 100644
index 000000000..6d8d6a15e
Binary files /dev/null and b/assets/generated/logo384.png differ
diff --git a/assets/generated/logo512.png b/assets/generated/logo512.png
new file mode 100644
index 000000000..9fc966d71
Binary files /dev/null and b/assets/generated/logo512.png differ
diff --git a/assets/generated/logo72.png b/assets/generated/logo72.png
new file mode 100644
index 000000000..657f63140
Binary files /dev/null and b/assets/generated/logo72.png differ
diff --git a/assets/generated/logo96.png b/assets/generated/logo96.png
new file mode 100644
index 000000000..f3c29005f
Binary files /dev/null and b/assets/generated/logo96.png differ
diff --git a/assets/generated/osm-logo-buggy-attr120.png b/assets/generated/osm-logo-buggy-attr120.png
new file mode 100644
index 000000000..b3b4686e5
Binary files /dev/null and b/assets/generated/osm-logo-buggy-attr120.png differ
diff --git a/assets/generated/osm-logo-buggy-attr128.png b/assets/generated/osm-logo-buggy-attr128.png
new file mode 100644
index 000000000..16500a20d
Binary files /dev/null and b/assets/generated/osm-logo-buggy-attr128.png differ
diff --git a/assets/generated/osm-logo-buggy-attr144.png b/assets/generated/osm-logo-buggy-attr144.png
new file mode 100644
index 000000000..656b86886
Binary files /dev/null and b/assets/generated/osm-logo-buggy-attr144.png differ
diff --git a/assets/generated/osm-logo-buggy-attr152.png b/assets/generated/osm-logo-buggy-attr152.png
new file mode 100644
index 000000000..26f57f9ac
Binary files /dev/null and b/assets/generated/osm-logo-buggy-attr152.png differ
diff --git a/assets/generated/osm-logo-buggy-attr180.png b/assets/generated/osm-logo-buggy-attr180.png
new file mode 100644
index 000000000..474bfd944
Binary files /dev/null and b/assets/generated/osm-logo-buggy-attr180.png differ
diff --git a/assets/generated/osm-logo-buggy-attr192.png b/assets/generated/osm-logo-buggy-attr192.png
new file mode 100644
index 000000000..023452c54
Binary files /dev/null and b/assets/generated/osm-logo-buggy-attr192.png differ
diff --git a/assets/generated/osm-logo-buggy-attr384.png b/assets/generated/osm-logo-buggy-attr384.png
new file mode 100644
index 000000000..f7fca3fae
Binary files /dev/null and b/assets/generated/osm-logo-buggy-attr384.png differ
diff --git a/assets/generated/osm-logo-buggy-attr512.png b/assets/generated/osm-logo-buggy-attr512.png
new file mode 100644
index 000000000..60eba9fd6
Binary files /dev/null and b/assets/generated/osm-logo-buggy-attr512.png differ
diff --git a/assets/generated/osm-logo-buggy-attr72.png b/assets/generated/osm-logo-buggy-attr72.png
new file mode 100644
index 000000000..5ca65d5f5
Binary files /dev/null and b/assets/generated/osm-logo-buggy-attr72.png differ
diff --git a/assets/generated/osm-logo-buggy-attr96.png b/assets/generated/osm-logo-buggy-attr96.png
new file mode 100644
index 000000000..2d061f233
Binary files /dev/null and b/assets/generated/osm-logo-buggy-attr96.png differ
diff --git a/assets/generated/star120.png b/assets/generated/star120.png
new file mode 100644
index 000000000..d0e27c9ba
Binary files /dev/null and b/assets/generated/star120.png differ
diff --git a/assets/generated/star128.png b/assets/generated/star128.png
new file mode 100644
index 000000000..913ed95f9
Binary files /dev/null and b/assets/generated/star128.png differ
diff --git a/assets/generated/star144.png b/assets/generated/star144.png
new file mode 100644
index 000000000..bb7a5565b
Binary files /dev/null and b/assets/generated/star144.png differ
diff --git a/assets/generated/star152.png b/assets/generated/star152.png
new file mode 100644
index 000000000..772270fb9
Binary files /dev/null and b/assets/generated/star152.png differ
diff --git a/assets/generated/star180.png b/assets/generated/star180.png
new file mode 100644
index 000000000..5a029f328
Binary files /dev/null and b/assets/generated/star180.png differ
diff --git a/assets/generated/star192.png b/assets/generated/star192.png
new file mode 100644
index 000000000..158ce6a13
Binary files /dev/null and b/assets/generated/star192.png differ
diff --git a/assets/generated/star384.png b/assets/generated/star384.png
new file mode 100644
index 000000000..97ebef61d
Binary files /dev/null and b/assets/generated/star384.png differ
diff --git a/assets/generated/star512.png b/assets/generated/star512.png
new file mode 100644
index 000000000..1dec5e586
Binary files /dev/null and b/assets/generated/star512.png differ
diff --git a/assets/generated/star72.png b/assets/generated/star72.png
new file mode 100644
index 000000000..af25d91dc
Binary files /dev/null and b/assets/generated/star72.png differ
diff --git a/assets/generated/star96.png b/assets/generated/star96.png
new file mode 100644
index 000000000..8435587fc
Binary files /dev/null and b/assets/generated/star96.png differ
diff --git a/assets/generated/themes_aed_aed120.png b/assets/generated/themes_aed_aed120.png
new file mode 100644
index 000000000..c84f4ca29
Binary files /dev/null and b/assets/generated/themes_aed_aed120.png differ
diff --git a/assets/generated/themes_aed_aed128.png b/assets/generated/themes_aed_aed128.png
new file mode 100644
index 000000000..729932777
Binary files /dev/null and b/assets/generated/themes_aed_aed128.png differ
diff --git a/assets/generated/themes_aed_aed144.png b/assets/generated/themes_aed_aed144.png
new file mode 100644
index 000000000..638db4db5
Binary files /dev/null and b/assets/generated/themes_aed_aed144.png differ
diff --git a/assets/generated/themes_aed_aed152.png b/assets/generated/themes_aed_aed152.png
new file mode 100644
index 000000000..e99bdce01
Binary files /dev/null and b/assets/generated/themes_aed_aed152.png differ
diff --git a/assets/generated/themes_aed_aed180.png b/assets/generated/themes_aed_aed180.png
new file mode 100644
index 000000000..538c41e20
Binary files /dev/null and b/assets/generated/themes_aed_aed180.png differ
diff --git a/assets/generated/themes_aed_aed192.png b/assets/generated/themes_aed_aed192.png
new file mode 100644
index 000000000..a788f68f0
Binary files /dev/null and b/assets/generated/themes_aed_aed192.png differ
diff --git a/assets/generated/themes_aed_aed384.png b/assets/generated/themes_aed_aed384.png
new file mode 100644
index 000000000..b99814fee
Binary files /dev/null and b/assets/generated/themes_aed_aed384.png differ
diff --git a/assets/generated/themes_aed_aed512.png b/assets/generated/themes_aed_aed512.png
new file mode 100644
index 000000000..dd34c2791
Binary files /dev/null and b/assets/generated/themes_aed_aed512.png differ
diff --git a/assets/generated/themes_aed_aed72.png b/assets/generated/themes_aed_aed72.png
new file mode 100644
index 000000000..41a3ad710
Binary files /dev/null and b/assets/generated/themes_aed_aed72.png differ
diff --git a/assets/generated/themes_aed_aed96.png b/assets/generated/themes_aed_aed96.png
new file mode 100644
index 000000000..d9f0c6a93
Binary files /dev/null and b/assets/generated/themes_aed_aed96.png differ
diff --git a/assets/generated/themes_artwork_artwork120.png b/assets/generated/themes_artwork_artwork120.png
new file mode 100644
index 000000000..bb20f991e
Binary files /dev/null and b/assets/generated/themes_artwork_artwork120.png differ
diff --git a/assets/generated/themes_artwork_artwork128.png b/assets/generated/themes_artwork_artwork128.png
new file mode 100644
index 000000000..cd8e66771
Binary files /dev/null and b/assets/generated/themes_artwork_artwork128.png differ
diff --git a/assets/generated/themes_artwork_artwork144.png b/assets/generated/themes_artwork_artwork144.png
new file mode 100644
index 000000000..3be143191
Binary files /dev/null and b/assets/generated/themes_artwork_artwork144.png differ
diff --git a/assets/generated/themes_artwork_artwork152.png b/assets/generated/themes_artwork_artwork152.png
new file mode 100644
index 000000000..99b8fbe7f
Binary files /dev/null and b/assets/generated/themes_artwork_artwork152.png differ
diff --git a/assets/generated/themes_artwork_artwork180.png b/assets/generated/themes_artwork_artwork180.png
new file mode 100644
index 000000000..50421f81b
Binary files /dev/null and b/assets/generated/themes_artwork_artwork180.png differ
diff --git a/assets/generated/themes_artwork_artwork192.png b/assets/generated/themes_artwork_artwork192.png
new file mode 100644
index 000000000..717d17489
Binary files /dev/null and b/assets/generated/themes_artwork_artwork192.png differ
diff --git a/assets/generated/themes_artwork_artwork384.png b/assets/generated/themes_artwork_artwork384.png
new file mode 100644
index 000000000..5d978b6c0
Binary files /dev/null and b/assets/generated/themes_artwork_artwork384.png differ
diff --git a/assets/generated/themes_artwork_artwork512.png b/assets/generated/themes_artwork_artwork512.png
new file mode 100644
index 000000000..fa07aa8a7
Binary files /dev/null and b/assets/generated/themes_artwork_artwork512.png differ
diff --git a/assets/generated/themes_artwork_artwork72.png b/assets/generated/themes_artwork_artwork72.png
new file mode 100644
index 000000000..f542b0a0d
Binary files /dev/null and b/assets/generated/themes_artwork_artwork72.png differ
diff --git a/assets/generated/themes_artwork_artwork96.png b/assets/generated/themes_artwork_artwork96.png
new file mode 100644
index 000000000..15012ee8c
Binary files /dev/null and b/assets/generated/themes_artwork_artwork96.png differ
diff --git a/assets/generated/themes_bookcases_bookcase120.png b/assets/generated/themes_bookcases_bookcase120.png
new file mode 100644
index 000000000..8f2fef4ea
Binary files /dev/null and b/assets/generated/themes_bookcases_bookcase120.png differ
diff --git a/assets/generated/themes_bookcases_bookcase128.png b/assets/generated/themes_bookcases_bookcase128.png
new file mode 100644
index 000000000..05b8fe9d1
Binary files /dev/null and b/assets/generated/themes_bookcases_bookcase128.png differ
diff --git a/assets/generated/themes_bookcases_bookcase144.png b/assets/generated/themes_bookcases_bookcase144.png
new file mode 100644
index 000000000..2e93c0729
Binary files /dev/null and b/assets/generated/themes_bookcases_bookcase144.png differ
diff --git a/assets/generated/themes_bookcases_bookcase152.png b/assets/generated/themes_bookcases_bookcase152.png
new file mode 100644
index 000000000..538d13be3
Binary files /dev/null and b/assets/generated/themes_bookcases_bookcase152.png differ
diff --git a/assets/generated/themes_bookcases_bookcase180.png b/assets/generated/themes_bookcases_bookcase180.png
new file mode 100644
index 000000000..cbee06de7
Binary files /dev/null and b/assets/generated/themes_bookcases_bookcase180.png differ
diff --git a/assets/generated/themes_bookcases_bookcase192.png b/assets/generated/themes_bookcases_bookcase192.png
new file mode 100644
index 000000000..c5da4c64e
Binary files /dev/null and b/assets/generated/themes_bookcases_bookcase192.png differ
diff --git a/assets/generated/themes_bookcases_bookcase384.png b/assets/generated/themes_bookcases_bookcase384.png
new file mode 100644
index 000000000..abfc9cd05
Binary files /dev/null and b/assets/generated/themes_bookcases_bookcase384.png differ
diff --git a/assets/generated/themes_bookcases_bookcase512.png b/assets/generated/themes_bookcases_bookcase512.png
new file mode 100644
index 000000000..c8edbe525
Binary files /dev/null and b/assets/generated/themes_bookcases_bookcase512.png differ
diff --git a/assets/generated/themes_bookcases_bookcase72.png b/assets/generated/themes_bookcases_bookcase72.png
new file mode 100644
index 000000000..c85d8b7bf
Binary files /dev/null and b/assets/generated/themes_bookcases_bookcase72.png differ
diff --git a/assets/generated/themes_bookcases_bookcase96.png b/assets/generated/themes_bookcases_bookcase96.png
new file mode 100644
index 000000000..fbf25e4d8
Binary files /dev/null and b/assets/generated/themes_bookcases_bookcase96.png differ
diff --git a/assets/generated/themes_buurtnatuur_groen_logo120.png b/assets/generated/themes_buurtnatuur_groen_logo120.png
new file mode 100644
index 000000000..adcb0a64a
Binary files /dev/null and b/assets/generated/themes_buurtnatuur_groen_logo120.png differ
diff --git a/assets/generated/themes_buurtnatuur_groen_logo128.png b/assets/generated/themes_buurtnatuur_groen_logo128.png
new file mode 100644
index 000000000..4f4593c6c
Binary files /dev/null and b/assets/generated/themes_buurtnatuur_groen_logo128.png differ
diff --git a/assets/generated/themes_buurtnatuur_groen_logo144.png b/assets/generated/themes_buurtnatuur_groen_logo144.png
new file mode 100644
index 000000000..d6adac1b2
Binary files /dev/null and b/assets/generated/themes_buurtnatuur_groen_logo144.png differ
diff --git a/assets/generated/themes_buurtnatuur_groen_logo152.png b/assets/generated/themes_buurtnatuur_groen_logo152.png
new file mode 100644
index 000000000..25d83261e
Binary files /dev/null and b/assets/generated/themes_buurtnatuur_groen_logo152.png differ
diff --git a/assets/generated/themes_buurtnatuur_groen_logo180.png b/assets/generated/themes_buurtnatuur_groen_logo180.png
new file mode 100644
index 000000000..13242770f
Binary files /dev/null and b/assets/generated/themes_buurtnatuur_groen_logo180.png differ
diff --git a/assets/generated/themes_buurtnatuur_groen_logo192.png b/assets/generated/themes_buurtnatuur_groen_logo192.png
new file mode 100644
index 000000000..db019da19
Binary files /dev/null and b/assets/generated/themes_buurtnatuur_groen_logo192.png differ
diff --git a/assets/generated/themes_buurtnatuur_groen_logo384.png b/assets/generated/themes_buurtnatuur_groen_logo384.png
new file mode 100644
index 000000000..fb623c7d7
Binary files /dev/null and b/assets/generated/themes_buurtnatuur_groen_logo384.png differ
diff --git a/assets/generated/themes_buurtnatuur_groen_logo512.png b/assets/generated/themes_buurtnatuur_groen_logo512.png
new file mode 100644
index 000000000..c2f51bfbe
Binary files /dev/null and b/assets/generated/themes_buurtnatuur_groen_logo512.png differ
diff --git a/assets/generated/themes_buurtnatuur_groen_logo72.png b/assets/generated/themes_buurtnatuur_groen_logo72.png
new file mode 100644
index 000000000..b6659f64e
Binary files /dev/null and b/assets/generated/themes_buurtnatuur_groen_logo72.png differ
diff --git a/assets/generated/themes_buurtnatuur_groen_logo96.png b/assets/generated/themes_buurtnatuur_groen_logo96.png
new file mode 100644
index 000000000..20e42912a
Binary files /dev/null and b/assets/generated/themes_buurtnatuur_groen_logo96.png differ
diff --git a/assets/generated/themes_cyclestreets_F111120.png b/assets/generated/themes_cyclestreets_F111120.png
new file mode 100644
index 000000000..9aed7616f
Binary files /dev/null and b/assets/generated/themes_cyclestreets_F111120.png differ
diff --git a/assets/generated/themes_cyclestreets_F111128.png b/assets/generated/themes_cyclestreets_F111128.png
new file mode 100644
index 000000000..60b8803d9
Binary files /dev/null and b/assets/generated/themes_cyclestreets_F111128.png differ
diff --git a/assets/generated/themes_cyclestreets_F111144.png b/assets/generated/themes_cyclestreets_F111144.png
new file mode 100644
index 000000000..34f19246d
Binary files /dev/null and b/assets/generated/themes_cyclestreets_F111144.png differ
diff --git a/assets/generated/themes_cyclestreets_F111152.png b/assets/generated/themes_cyclestreets_F111152.png
new file mode 100644
index 000000000..c98a5025a
Binary files /dev/null and b/assets/generated/themes_cyclestreets_F111152.png differ
diff --git a/assets/generated/themes_cyclestreets_F111180.png b/assets/generated/themes_cyclestreets_F111180.png
new file mode 100644
index 000000000..5dd60ca2f
Binary files /dev/null and b/assets/generated/themes_cyclestreets_F111180.png differ
diff --git a/assets/generated/themes_cyclestreets_F111192.png b/assets/generated/themes_cyclestreets_F111192.png
new file mode 100644
index 000000000..97f7339de
Binary files /dev/null and b/assets/generated/themes_cyclestreets_F111192.png differ
diff --git a/assets/generated/themes_cyclestreets_F111384.png b/assets/generated/themes_cyclestreets_F111384.png
new file mode 100644
index 000000000..44c7dd7d4
Binary files /dev/null and b/assets/generated/themes_cyclestreets_F111384.png differ
diff --git a/assets/generated/themes_cyclestreets_F111512.png b/assets/generated/themes_cyclestreets_F111512.png
new file mode 100644
index 000000000..2cbadd7ea
Binary files /dev/null and b/assets/generated/themes_cyclestreets_F111512.png differ
diff --git a/assets/generated/themes_cyclestreets_F11172.png b/assets/generated/themes_cyclestreets_F11172.png
new file mode 100644
index 000000000..f4d0f4b67
Binary files /dev/null and b/assets/generated/themes_cyclestreets_F11172.png differ
diff --git a/assets/generated/themes_cyclestreets_F11196.png b/assets/generated/themes_cyclestreets_F11196.png
new file mode 100644
index 000000000..c4f82eb7b
Binary files /dev/null and b/assets/generated/themes_cyclestreets_F11196.png differ
diff --git a/assets/generated/themes_toilets_toilets120.png b/assets/generated/themes_toilets_toilets120.png
new file mode 100644
index 000000000..696d3daa4
Binary files /dev/null and b/assets/generated/themes_toilets_toilets120.png differ
diff --git a/assets/generated/themes_toilets_toilets128.png b/assets/generated/themes_toilets_toilets128.png
new file mode 100644
index 000000000..a4320e5d1
Binary files /dev/null and b/assets/generated/themes_toilets_toilets128.png differ
diff --git a/assets/generated/themes_toilets_toilets144.png b/assets/generated/themes_toilets_toilets144.png
new file mode 100644
index 000000000..cceaea05d
Binary files /dev/null and b/assets/generated/themes_toilets_toilets144.png differ
diff --git a/assets/generated/themes_toilets_toilets152.png b/assets/generated/themes_toilets_toilets152.png
new file mode 100644
index 000000000..4a3a58a20
Binary files /dev/null and b/assets/generated/themes_toilets_toilets152.png differ
diff --git a/assets/generated/themes_toilets_toilets180.png b/assets/generated/themes_toilets_toilets180.png
new file mode 100644
index 000000000..adc5dc6e4
Binary files /dev/null and b/assets/generated/themes_toilets_toilets180.png differ
diff --git a/assets/generated/themes_toilets_toilets192.png b/assets/generated/themes_toilets_toilets192.png
new file mode 100644
index 000000000..84f568f2f
Binary files /dev/null and b/assets/generated/themes_toilets_toilets192.png differ
diff --git a/assets/generated/themes_toilets_toilets384.png b/assets/generated/themes_toilets_toilets384.png
new file mode 100644
index 000000000..eb542f2af
Binary files /dev/null and b/assets/generated/themes_toilets_toilets384.png differ
diff --git a/assets/generated/themes_toilets_toilets512.png b/assets/generated/themes_toilets_toilets512.png
new file mode 100644
index 000000000..07c0daffe
Binary files /dev/null and b/assets/generated/themes_toilets_toilets512.png differ
diff --git a/assets/generated/themes_toilets_toilets72.png b/assets/generated/themes_toilets_toilets72.png
new file mode 100644
index 000000000..e1a254299
Binary files /dev/null and b/assets/generated/themes_toilets_toilets72.png differ
diff --git a/assets/generated/themes_toilets_toilets96.png b/assets/generated/themes_toilets_toilets96.png
new file mode 100644
index 000000000..44bd8fdb4
Binary files /dev/null and b/assets/generated/themes_toilets_toilets96.png differ
diff --git a/assets/layers/bird_hide/birdhides.json b/assets/layers/bird_hide/birdhides.json
index 78fc325b4..fe8325223 100644
--- a/assets/layers/bird_hide/birdhides.json
+++ b/assets/layers/bird_hide/birdhides.json
@@ -211,12 +211,12 @@
   "color": {
     "render": {
       "nl": "#94bb28"
-    },
+    }
   },
   "stroke": {
     "render": {
       "nl": "3"
-    },
+    }
   },
   "presets": [
     {
diff --git a/assets/themes/aed/aed.json b/assets/themes/aed/aed.json
index 91f304013..c47089066 100644
--- a/assets/themes/aed/aed.json
+++ b/assets/themes/aed/aed.json
@@ -55,13 +55,13 @@
       "tagRenderings": [
         "pictures",
         {
+          "question": {
+            "en": "Is this defibrillator located indoors?",
+            "fr": "Ce défibrillateur est-il disposé en intérieur ?",
+            "nl": "Hangt deze defibrillator binnen of buiten?"
+          },  
           "mappings": [
             {
-              "question": {
-                "en": "Is this defibrillator located indoors?",
-                "fr": "Ce défibrillateur est-il disposé en intérieur ?",
-                "nl": "Hangt deze defibrillator binnen of buiten?"
-              },
               "if": "indoor=yes",
               "then": {
                 "en": "This defibrillator is located indoors",
diff --git a/bookcases.html b/bookcases.html
new file mode 100644
index 000000000..99a8ff81e
--- /dev/null
+++ b/bookcases.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./bookcases.webmanifest">
+    <link rel="icon" href="./assets/themes/bookcases/bookcase.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="./assets/add.svg">
+    <meta property="og:title" content="Open Bookcase Map">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/themes/bookcases/bookcase.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/bookcases.webmanifest b/bookcases.webmanifest
new file mode 100644
index 000000000..49944ff1b
--- /dev/null
+++ b/bookcases.webmanifest
@@ -0,0 +1 @@
+{"name":"bookcases","short_name":"Open Bookcase Map","start_url":"/MapComplete/bookcases.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/themes_bookcases_bookcase72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/themes_bookcases_bookcase96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/themes_bookcases_bookcase120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/themes_bookcases_bookcase128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/themes_bookcases_bookcase144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/themes_bookcases_bookcase152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/themes_bookcases_bookcase180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/themes_bookcases_bookcase192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/themes_bookcases_bookcase384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/themes_bookcases_bookcase512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/themes/bookcases/bookcase.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/buurtnatuur.html b/buurtnatuur.html
new file mode 100644
index 000000000..51016d649
--- /dev/null
+++ b/buurtnatuur.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./buurtnatuur.webmanifest">
+    <link rel="icon" href="./assets/themes/buurtnatuur/groen_logo.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="assets/themes/buurtnatuur/social_image.jpg">
+    <meta property="og:title" content="Buurtnatuur.be">
+    <meta property="og:description" content="Met deze tool kan je natuur in je buurt in kaart brengen en meer informatie geven over je favoriete plekje">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/themes/buurtnatuur/groen_logo.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/buurtnatuur.webmanifest b/buurtnatuur.webmanifest
new file mode 100644
index 000000000..1dcfab763
--- /dev/null
+++ b/buurtnatuur.webmanifest
@@ -0,0 +1 @@
+{"name":"buurtnatuur","short_name":"Buurtnatuur.be","start_url":"/MapComplete/buurtnatuur.html","display":"standalone","background_color":"#fff","description":"Met deze tool kan je natuur in je buurt in kaart brengen en meer informatie geven over je favoriete plekje","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/themes_buurtnatuur_groen_logo72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/themes_buurtnatuur_groen_logo96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/themes_buurtnatuur_groen_logo120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/themes_buurtnatuur_groen_logo128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/themes_buurtnatuur_groen_logo144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/themes_buurtnatuur_groen_logo152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/themes_buurtnatuur_groen_logo180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/themes_buurtnatuur_groen_logo192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/themes_buurtnatuur_groen_logo384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/themes_buurtnatuur_groen_logo512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/themes/buurtnatuur/groen_logo.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/css/mobile.css b/css/mobile.css
new file mode 100644
index 000000000..e69de29bb
diff --git a/cyclofix.html b/cyclofix.html
new file mode 100644
index 000000000..b5d8b331a
--- /dev/null
+++ b/cyclofix.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./cyclofix.webmanifest">
+    <link rel="icon" href="./assets/bike/logo.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="./assets/bike/cyclofix.jpeg">
+    <meta property="og:title" content="Cyclofix - an open map for cyclists">
+    <meta property="og:description" content="Easily search and contribute bicycle data nearby">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/bike/logo.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/cyclofix.webmanifest b/cyclofix.webmanifest
new file mode 100644
index 000000000..0b5fa4292
--- /dev/null
+++ b/cyclofix.webmanifest
@@ -0,0 +1 @@
+{"name":"cyclofix","short_name":"Cyclofix - an open map for cyclists","start_url":"/MapComplete/cyclofix.html","display":"standalone","background_color":"#fff","description":"Easily search and contribute bicycle data nearby","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/bike_logo72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/bike_logo96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/bike_logo120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/bike_logo128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/bike_logo144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/bike_logo152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/bike_logo180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/bike_logo192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/bike_logo384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/bike_logo512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/bike/logo.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/deploy.sh b/deploy.sh
index c966e4929..fd84c6cf8 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -4,11 +4,21 @@ mkdir assets/generated
 ts-node createLayouts.ts
 find -name '*.png' | parallel optipng '{}'
 npm run build
-rm -rf /home/pietervdvn/git/pietervdvn.github.io/MapComplete/*
-cp -r dist/* /home/pietervdvn/git/pietervdvn.github.io/MapComplete/
 
-cd /home/pietervdvn/git/pietervdvn.github.io/MapComplete/
-git add . && git commit -m "New mapcomplete version" &&git push
+if [[ $1 == "production" ]]
+then
+    echo "DEPLOYING TO PRODUCTION!"
+    rm -rf /home/pietervdvn/git/pietervdvn.github.io/MapComplete/*
+    cp -r dist/* /home/pietervdvn/git/pietervdvn.github.io/MapComplete/
+    cd /home/pietervdvn/git/pietervdvn.github.io/MapComplete/
+else
+    echo "Testversion deploy"
+    rm -rf /home/pietervdvn/git/pietervdvn.github.io/Staging/*
+    cp -r dist/* /home/pietervdvn/git/pietervdvn.github.io/Staging/
+    cd /home/pietervdvn/git/pietervdvn.github.io/Staging/
+fi
+
+git add . && git commit -m "New mapcomplete version" && git push
 cd -
 # clean up the mess we made
  # rm *.js
diff --git a/fietsstraten.html b/fietsstraten.html
new file mode 100644
index 000000000..96824deb4
--- /dev/null
+++ b/fietsstraten.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./fietsstraten.webmanifest">
+    <link rel="icon" href="./assets/themes/cyclestreets/F111.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="./assets/add.svg">
+    <meta property="og:title" content="Fietsstraten">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/themes/cyclestreets/F111.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/fietsstraten.webmanifest b/fietsstraten.webmanifest
new file mode 100644
index 000000000..cf63d9173
--- /dev/null
+++ b/fietsstraten.webmanifest
@@ -0,0 +1 @@
+{"name":"fietsstraten","short_name":"Fietsstraten","start_url":"/MapComplete/fietsstraten.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/themes_cyclestreets_F11172.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/themes_cyclestreets_F11196.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/themes_cyclestreets_F111120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/themes_cyclestreets_F111128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/themes_cyclestreets_F111144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/themes_cyclestreets_F111152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/themes_cyclestreets_F111180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/themes_cyclestreets_F111192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/themes_cyclestreets_F111384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/themes_cyclestreets_F111512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/themes/cyclestreets/F111.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/ghostbikes.html b/ghostbikes.html
new file mode 100644
index 000000000..f4222c993
--- /dev/null
+++ b/ghostbikes.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./ghostbikes.webmanifest">
+    <link rel="icon" href="./assets/layers/ghost_bike/ghost_bike.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="./assets/add.svg">
+    <meta property="og:title" content="Ghost bikes">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/layers/ghost_bike/ghost_bike.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/ghostbikes.webmanifest b/ghostbikes.webmanifest
new file mode 100644
index 000000000..91af6b636
--- /dev/null
+++ b/ghostbikes.webmanifest
@@ -0,0 +1 @@
+{"name":"ghostbikes","short_name":"Witte Fietsen","start_url":"/MapComplete/ghostbikes.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/layers_ghost_bike_ghost_bike72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/layers_ghost_bike_ghost_bike96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/layers_ghost_bike_ghost_bike120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/layers_ghost_bike_ghost_bike128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/layers_ghost_bike_ghost_bike144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/layers_ghost_bike_ghost_bike152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/layers_ghost_bike_ghost_bike180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/layers_ghost_bike_ghost_bike192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/layers_ghost_bike_ghost_bike384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/layers_ghost_bike_ghost_bike512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/layers/ghost_bike/ghost_bike.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/grb.html b/grb.html
new file mode 100644
index 000000000..734a8682f
--- /dev/null
+++ b/grb.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./grb.webmanifest">
+    <link rel="icon" href="./assets/logo.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="">
+    <meta property="og:title" content="Grb import fix tool">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/logo.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/grb.webmanifest b/grb.webmanifest
new file mode 100644
index 000000000..23a961309
--- /dev/null
+++ b/grb.webmanifest
@@ -0,0 +1 @@
+{"name":"grb","short_name":"Grb import fix tool","start_url":"/MapComplete/grb.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/logo72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/logo96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/logo120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/logo128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/logo144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/logo152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/logo180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/logo192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/logo384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/logo512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/logo.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/index.css b/index.css
index dfcec5154..48e034df9 100644
--- a/index.css
+++ b/index.css
@@ -174,67 +174,81 @@
 
 }
 
-#userbadge {
-    width: 100%
-}
+    #userbadge {
+        width: 100%
+    }
+
+    #userbadge p {
+        margin: 0;
+        padding-top: 0.2em;
+        padding-bottom: 0.2em;
+    }
 
-#userbadge p {
-    margin: 0;
-    padding-top: 0.2em;
-    padding-bottom: 0.2em;
-}
     #hidden-on-mobile {
         display: none; /*Only shown on small screens*/
     }
 
-
-@media only screen and (max-height: 600px) and (not (max-width:700px)) {
-
-    /* Landscape and portrait */
-    #topleft-tools {
-        padding: 0.1em;
-        padding-left: unset;
-    }
-
-    #userbadge-and-search {
-        position: relative;
+    .add-popup-all-buttons {
+        max-height: 50vh;
         display: inline-block;
-        width: auto;
-        max-width: 50vw;
-        margin: 0;
+        overflow-y: auto;
+        width: 100%;
     }
 
+    @media only screen and (max-height: 600px) and (not (max-width:
+
+    700px
+
+    )) {
+
+        /* Landscape and portrait */
+        #topleft-tools {
+            padding: 0.1em;
+            padding-left: unset;
+        }
+
+
+        #userbadge-and-search {
+            position: relative;
+            display: inline-block;
+            width: auto;
+            max-width: 50vw;
+            margin: 0;
+        }
+
     #userbadge {
         position: fixed;
         right: 0.3em;
         width: min-content;
         max-width: 50vw;
-        margin:0;
+        margin: 0;
         padding: 0;
     }
 
 
-}
-
-
-@media only screen and (max-width: 600px) {
-    /* Portrait */
-    #userbadge-and-search {
-        display: inline-block;
-        width: auto;
-        max-width: 100vw;
     }
 
-    #topleft-tools {
-        padding: 0.2em !important;
-        padding-top: 0.3em !important;
-    }
 
-    #userbadge {
-        margin-bottom: 0.3em;
-    }
+    @media only screen and (max-width: 600px) {
+        /* Portrait */
+        #userbadge-and-search {
+            display: inline-block;
+            width: auto;
+            max-width: 100vw;
+        }
+        
 
-}
+
+        #topleft-tools {
+            padding: 0.2em !important;
+            padding-top: 0.3em !important;
+        }
+
+        #userbadge {
+            margin-bottom: 0.3em;
+        }
+
+    }
 
 
 /**************************************/
@@ -492,13 +506,23 @@
         width: 60%;
 
     }
+    .add-popup-all-buttons {
+        max-height: calc(100vh - 12em);
+        height: min-content;
+        display: inline-block;
+        overflow-y: auto;
+        width: 100%;
+    }
 
     .messagesboxmobile-scroll {
         display: block;
         width: 100vw;
         box-sizing: border-box;
-        overflow-y: scroll;
-        padding: 1em;
+        overflow-y: auto;
+        padding-left: 1em;
+        padding-right: 1em;
+        padding-top: 0;
+        padding-bottom: 0;
         margin: 0;
         height: calc(100vh - 5em); /*Height of to-the-map is 5em*/
     }
@@ -565,7 +589,6 @@
             z-index: 5;
             right: 0;
             bottom: 0;
-            height: auto;
             margin: 0;
             padding: 1em;
             padding-bottom: 0.75em;
@@ -595,26 +618,7 @@
 
     }
 
-.logo {
-    float:right;
-    margin: 1em;
-    width: 10em;
-    height: auto;
-}
 
-#top-right {
-
-    position: absolute;
-    display: block;
-    right: 0.5em;
-    top: 0.5em;
-    z-index: 5000;
-
-
-}
-
-
-/************ Slideshow *****************/
 
 
 
@@ -778,31 +782,6 @@
     }
 
 
-    .editbutton {
-        width: 1.3em;
-        height: 1.3em;
-        padding: 0.5em;
-        border-radius: 0.65em;
-        border: solid black 1px;
-
-        font-size: medium;
-        float: right;
-
-
-    }
-
-    .wikipedialink {
-        position: absolute;
-        right: 24px;
-        width: 24px;
-        height: 24px;
-        padding-right: 12px;
-    }
-
-    .wikipedialink img {
-        width: 24px;
-        height: 24px;
-    }
 
 
     .featureinfoboxtitle span {
@@ -1083,9 +1062,6 @@
     box-sizing: border-box;
 }
 
-.iframe-code-block {
-
-}
 
 .iframe-escape {
     background-color: white;
@@ -1151,12 +1127,6 @@
         font-size: large;
     }
 
-    .add-popup-all-buttons {
-        max-height: 50vh;
-        display: inline-block;
-        overflow-y: auto;
-        width: 100%;
-    }
 
     .custom-layer-panel {
 
diff --git a/index.ts b/index.ts
index 05396cc62..dc0146043 100644
--- a/index.ts
+++ b/index.ts
@@ -28,7 +28,7 @@ if (location.href.startsWith("http://buurtnatuur.be")) {
     window.location.replace("https://buurtnatuur.be");
 }
 
-    const testing = QueryParameters.GetQueryParameter("test", "true");
+let testing = QueryParameters.GetQueryParameter("test", "false");
 if (location.hostname === "localhost" || location.hostname === "127.0.0.1") {
     // Set to true if testing and changes should NOT be saved
     testing.setData(testing.data ?? "true")
diff --git a/metamap.html b/metamap.html
new file mode 100644
index 000000000..5fc561fb4
--- /dev/null
+++ b/metamap.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./metamap.webmanifest">
+    <link rel="icon" href="./assets/osm-logo-buggy-attr.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="">
+    <meta property="og:title" content="Open Map Map">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/osm-logo-buggy-attr.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/metamap.webmanifest b/metamap.webmanifest
new file mode 100644
index 000000000..2c2879ed2
--- /dev/null
+++ b/metamap.webmanifest
@@ -0,0 +1 @@
+{"name":"metamap","short_name":"Open Map Map","start_url":"/MapComplete/metamap.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/osm-logo-buggy-attr72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/osm-logo-buggy-attr96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/osm-logo-buggy-attr120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/osm-logo-buggy-attr128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/osm-logo-buggy-attr144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/osm-logo-buggy-attr152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/osm-logo-buggy-attr180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/osm-logo-buggy-attr192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/osm-logo-buggy-attr384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/osm-logo-buggy-attr512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/osm-logo-buggy-attr.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/natuurpunt.html b/natuurpunt.html
new file mode 100644
index 000000000..52cd639fb
--- /dev/null
+++ b/natuurpunt.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./natuurpunt.webmanifest">
+    <link rel="icon" href="./assets/layers/bird_hide/birdhide.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="">
+    <meta property="og:title" content="De natuur in">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/layers/bird_hide/birdhide.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/natuurpunt.webmanifest b/natuurpunt.webmanifest
new file mode 100644
index 000000000..148d28cef
--- /dev/null
+++ b/natuurpunt.webmanifest
@@ -0,0 +1 @@
+{"name":"natuurpunt","short_name":"De natuur in","start_url":"/MapComplete/natuurpunt.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/layers_bird_hide_birdhide72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/layers_bird_hide_birdhide96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/layers_bird_hide_birdhide120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/layers_bird_hide_birdhide128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/layers_bird_hide_birdhide144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/layers_bird_hide_birdhide152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/layers_bird_hide_birdhide180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/layers_bird_hide_birdhide192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/layers_bird_hide_birdhide384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/layers_bird_hide_birdhide512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/layers/bird_hide/birdhide.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/personal.html b/personal.html
new file mode 100644
index 000000000..c166f33b3
--- /dev/null
+++ b/personal.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./personal.webmanifest">
+    <link rel="icon" href="./assets/star.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="">
+    <meta property="og:title" content="Personal theme">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/star.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/personal.webmanifest b/personal.webmanifest
new file mode 100644
index 000000000..0d0933903
--- /dev/null
+++ b/personal.webmanifest
@@ -0,0 +1 @@
+{"name":"personal","short_name":"Personal theme","start_url":"/MapComplete/personal.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/star72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/star96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/star120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/star128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/star144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/star152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/star180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/star192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/star384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/star512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/star.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/toilets.html b/toilets.html
new file mode 100644
index 000000000..6dbea85ff
--- /dev/null
+++ b/toilets.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./toilets.webmanifest">
+    <link rel="icon" href="./assets/themes/toilets/toilets.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="./assets/add.svg">
+    <meta property="og:title" content="Open Toilet Map">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/themes/toilets/toilets.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/toilets.webmanifest b/toilets.webmanifest
new file mode 100644
index 000000000..1cd4499b0
--- /dev/null
+++ b/toilets.webmanifest
@@ -0,0 +1 @@
+{"name":"toilets","short_name":"Open Toilet Map","start_url":"/MapComplete/toilets.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/themes_toilets_toilets72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/themes_toilets_toilets96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/themes_toilets_toilets120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/themes_toilets_toilets128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/themes_toilets_toilets144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/themes_toilets_toilets152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/themes_toilets_toilets180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/themes_toilets_toilets192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/themes_toilets_toilets384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/themes_toilets_toilets512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/themes/toilets/toilets.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file
diff --git a/width.html b/width.html
new file mode 100644
index 000000000..cd2efcb75
--- /dev/null
+++ b/width.html
@@ -0,0 +1,70 @@
+<!DOCTYPE html>    
+<!-- WARNING: index.html serves as a template. If you want to change something, change it there -->
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
+    <title>MapComplete</title>
+    <link rel="stylesheet" href="./vendor/leaflet.css"/>
+    <link rel="stylesheet" href="./index.css"/>
+    <link rel="stylesheet" href="./css/userbadge.css"/>
+    <link rel="stylesheet" href="./css/slideshow.css"/>
+    <link rel="manifest" href="./width.webmanifest">
+    <link rel="icon" href="./assets/bug.svg" sizes="any" type="image/svg+xml">
+    
+    <meta property="og:type" content="website">
+    
+    <meta property="og:image" content="">
+    <meta property="og:title" content="Straatbreedtes in Brugge">
+    <meta property="og:description" content="Easily add and edit geodata with OpenStreetMap">
+
+    <style>
+        #decoration-desktop img {
+            width: 100%;
+            height: 100%;
+        }
+    </style>
+    
+</head>
+<body>
+
+<div style="position: absolute; left: 1em; bottom: 1em; width:35vh; height:35vh;"
+     id="decoration-desktop">
+    <!-- A nice decoration while loading or on errors -->
+    <img src='./assets/bug.svg' width="100%" height="100%">
+</div>
+
+<div id="hidden-on-mobile">
+    <div id="messagesboxmobile">
+    </div>
+</div>
+
+<div id="topleft-tools">
+    <div id="userbadge-and-search">
+        <div id="userbadge" class="shadow">
+        </div>
+        <div id="searchbox" class="shadow"></div>
+    </div>
+    <div id="messagesbox"></div>
+    <br/>
+    <div id="help-button-mobile"></div>
+</div>
+
+<div id="filter__popup" class="filter__popup">
+    <div id="filter__selection"></div>
+</div>
+
+<div id="centermessage">Loading MapComplete, hang on...</div>
+<div id="top-right"></div>
+
+<div id="geolocate-button"></div>
+<div id="leafletDiv"></div>
+
+<script src="./index.ts"></script>
+<script src="./vendor/Leaflet.AccuratePosition.js"></script>
+
+<script data-goatcounter="https://pietervdvn.goatcounter.com/count"
+        async src="//gc.zgo.at/count.js"></script>
+
+</body>
+</html>
diff --git a/width.webmanifest b/width.webmanifest
new file mode 100644
index 000000000..1ec3e4a1c
--- /dev/null
+++ b/width.webmanifest
@@ -0,0 +1 @@
+{"name":"width","short_name":"Straatbreedtes in Brugge","start_url":"/MapComplete/width.html","display":"standalone","background_color":"#fff","description":"","orientation":"portrait-primary, landscape-primary","icons":[{"src":"assets/generated/bug72.png","sizes":"72x72","type":"image/png"},{"src":"assets/generated/bug96.png","sizes":"96x96","type":"image/png"},{"src":"assets/generated/bug120.png","sizes":"120x120","type":"image/png"},{"src":"assets/generated/bug128.png","sizes":"128x128","type":"image/png"},{"src":"assets/generated/bug144.png","sizes":"144x144","type":"image/png"},{"src":"assets/generated/bug152.png","sizes":"152x152","type":"image/png"},{"src":"assets/generated/bug180.png","sizes":"180x180","type":"image/png"},{"src":"assets/generated/bug192.png","sizes":"192x192","type":"image/png"},{"src":"assets/generated/bug384.png","sizes":"384x384","type":"image/png"},{"src":"assets/generated/bug512.png","sizes":"512x512","type":"image/png"},{"src":"./assets/bug.svg","sizes":"513x513","type":"image/svg"}]}
\ No newline at end of file