diff --git a/Docs/BuiltinIndex.md b/Docs/BuiltinIndex.md
index 8b46f5d17f..e12a3076de 100644
--- a/Docs/BuiltinIndex.md
+++ b/Docs/BuiltinIndex.md
@@ -112,6 +112,7 @@
   - extinguisher
   - fire_station
   - fitness_centre
+  - fitness_station
   - food
   - ghost_bike
   - governments
diff --git a/Docs/CalculatedTags.md b/Docs/CalculatedTags.md
index 3796df872c..af65890355 100644
--- a/Docs/CalculatedTags.md
+++ b/Docs/CalculatedTags.md
@@ -23,6 +23,7 @@
     + [sidewalk:left, sidewalk:right, generic_key:left:property, generic_key:right:property](#sidewalkleft,-sidewalk:right,-generic_key:left:property,-generic_key:right:property)
     + [_geometry:type](#_geometrytype)
     + [_level](#_level)
+    + [_referencing_ways](#_referencing_ways)
     + [distanceTo](#distanceto)
     + [overlapWith](#overlapwith)
     + [enclosingFeatures](#enclosingfeatures)
@@ -191,6 +192,16 @@ Extract the 'level'-tag into a normalized, ';'-separated value
 
 
 
+### _referencing_ways 
+
+
+
+_referencing_ways contains - for a node - which ways use this this node as point in their geometry. 
+
+This is a lazy metatag and is only calculated when needed
+
+
+
  Calculating tags with Javascript 
 ----------------------------------
 
diff --git a/Docs/Layers/barrier.md b/Docs/Layers/barrier.md
index 64107aa322..d1959ca6f2 100644
--- a/Docs/Layers/barrier.md
+++ b/Docs/Layers/barrier.md
@@ -100,6 +100,8 @@ The question is  *Can a bicycle go past this barrier?*
   - *A cyclist can not go past this.*  corresponds with  `bicycle=no`
 
 
+This tagrendering is only visible in the popup if the following condition is met: `_referencing_ways~.+`
+
 
 
 ### barrier_type 
@@ -171,6 +173,8 @@ This is rendered with  `Maximum width: {maxwidth:physical} m`
 
 
 
+This tagrendering is only visible in the popup if the following condition is met: `cycle_barrier!=double&cycle_barrier!=triple&_referencing_ways~.+`
+
 
 
 ### Space between barrier (cyclebarrier) 
diff --git a/Docs/Layers/fitness_station.md b/Docs/Layers/fitness_station.md
index 3a81f7d62a..43ace1fd83 100644
--- a/Docs/Layers/fitness_station.md
+++ b/Docs/Layers/fitness_station.md
@@ -68,6 +68,18 @@ attribute | type | values which are supported by this layer
 
 
 
+### images 
+
+
+
+This block shows the known images which are linked with the `image`-keys, but also via `mapillary` and `wikidata`
+
+This tagrendering has no question and is thus read-only
+
+
+
+
+
 ### name 
 
 
diff --git a/Docs/Layers/osm_community_index.md b/Docs/Layers/osm_community_index.md
index 3ddef1e98f..6bec28bc71 100644
--- a/Docs/Layers/osm_community_index.md
+++ b/Docs/Layers/osm_community_index.md
@@ -15,7 +15,7 @@ A layer showing the OpenStreetMap Communities
 
 
   - This layer is shown at zoomlevel **0** and higher
-  - <img src='../warning.svg' height='1rem'/> This layer is loaded from an external source, namely  `https://raw.githubusercontent.com/osmlab/osm-community-index/main/dist/completeFeatureCollection.json`
+  - <img src='../warning.svg' height='1rem'/> This layer is loaded from an external source, namely  `https://raw.githubusercontent.com/pietervdvn/MapComplete-data/main/community_index/tile_{z}_{x}_{y}.geojson`
 
 
 
diff --git a/Docs/TagInfo/mapcomplete_cycle_infra.json b/Docs/TagInfo/mapcomplete_cycle_infra.json
index 276e0b688e..29a12cf984 100644
--- a/Docs/TagInfo/mapcomplete_cycle_infra.json
+++ b/Docs/TagInfo/mapcomplete_cycle_infra.json
@@ -591,12 +591,12 @@
     },
     {
       "key": "bicycle",
-      "description": "Layer 'Barriers' shows bicycle=yes with a fixed text, namely 'A cyclist can go past this.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
+      "description": "Layer 'Barriers' shows bicycle=yes with a fixed text, namely 'A cyclist can go past this.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure') (This is only shown if _referencing_ways~.+)",
       "value": "yes"
     },
     {
       "key": "bicycle",
-      "description": "Layer 'Barriers' shows bicycle=no with a fixed text, namely 'A cyclist can not go past this.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure')",
+      "description": "Layer 'Barriers' shows bicycle=no with a fixed text, namely 'A cyclist can not go past this.' and allows to pick this as a default answer (in the MapComplete.osm.be theme 'Bicycle infrastructure') (This is only shown if _referencing_ways~.+)",
       "value": "no"
     },
     {
@@ -656,7 +656,7 @@
     },
     {
       "key": "maxwidth:physical",
-      "description": "Layer 'Barriers' shows and asks freeform values for key 'maxwidth:physical' (in the MapComplete.osm.be theme 'Bicycle infrastructure') (This is only shown if cycle_barrier!=double&cycle_barrier!=triple)"
+      "description": "Layer 'Barriers' shows and asks freeform values for key 'maxwidth:physical' (in the MapComplete.osm.be theme 'Bicycle infrastructure') (This is only shown if cycle_barrier!=double&cycle_barrier!=triple&_referencing_ways~.+)"
     },
     {
       "key": "width:separation",
diff --git a/Docs/TagInfo/mapcomplete_personal.json b/Docs/TagInfo/mapcomplete_personal.json
index 3a4e94a563..e22653e2cb 100644
--- a/Docs/TagInfo/mapcomplete_personal.json
+++ b/Docs/TagInfo/mapcomplete_personal.json
@@ -6003,6 +6003,22 @@
       "description": "The MapComplete theme Personal theme has a layer Fitness Stations showing features with this tag",
       "value": "fitness_station"
     },
+    {
+      "key": "image",
+      "description": "The layer 'Fitness Stations allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Fitness Stations allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Fitness Stations allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Fitness Stations allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
     {
       "key": "name",
       "description": "Layer 'Fitness Stations' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Personal theme')"
diff --git a/Docs/TagInfo/mapcomplete_sports.json b/Docs/TagInfo/mapcomplete_sports.json
index 7a4c83f132..64a479203e 100644
--- a/Docs/TagInfo/mapcomplete_sports.json
+++ b/Docs/TagInfo/mapcomplete_sports.json
@@ -273,6 +273,22 @@
       "description": "The MapComplete theme Sports has a layer Fitness Stations showing features with this tag",
       "value": "fitness_station"
     },
+    {
+      "key": "image",
+      "description": "The layer 'Fitness Stations allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "mapillary",
+      "description": "The layer 'Fitness Stations allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikidata",
+      "description": "The layer 'Fitness Stations allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
+    {
+      "key": "wikipedia",
+      "description": "The layer 'Fitness Stations allows to upload images and adds them under the 'image'-tag (and image:0, image:1, ... for multiple images). Furhtermore, this layer shows images based on the keys image, wikidata, wikipedia, wikimedia_commons and mapillary"
+    },
     {
       "key": "name",
       "description": "Layer 'Fitness Stations' shows and asks freeform values for key 'name' (in the MapComplete.osm.be theme 'Sports')"
diff --git a/Docs/Themes/aed.md b/Docs/Themes/aed.md
index 3124432836..a4b64a004a 100644
--- a/Docs/Themes/aed.md
+++ b/Docs/Themes/aed.md
@@ -1,7 +1,7 @@
 
 
  Open AED Map ( [aed](https://mapcomplete.osm.be/aed) ) 
----------------------
+--------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/artwork.md b/Docs/Themes/artwork.md
index 242abe30c3..3ee079cf8c 100644
--- a/Docs/Themes/artwork.md
+++ b/Docs/Themes/artwork.md
@@ -1,7 +1,7 @@
 
 
- Open Artwork Map ( artwork) 
------------------------------
+ Open Artwork Map ( [artwork](https://mapcomplete.osm.be/artwork) ) 
+--------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/atm.md b/Docs/Themes/atm.md
index 8b9d06bd41..5d7cd17554 100644
--- a/Docs/Themes/atm.md
+++ b/Docs/Themes/atm.md
@@ -1,7 +1,7 @@
 
 
- ATM Machines ( atm) 
----------------------
+ ATM Machines ( [atm](https://mapcomplete.osm.be/atm) ) 
+--------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/bag.md b/Docs/Themes/bag.md
index 0217fdd21f..9cf4b92789 100644
--- a/Docs/Themes/bag.md
+++ b/Docs/Themes/bag.md
@@ -1,7 +1,7 @@
 
 
- BAG import helper ( bag) 
---------------------------
+ BAG import helper ( [bag](https://mapcomplete.osm.be/bag) ) 
+-------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/benches.md b/Docs/Themes/benches.md
index b295a66f5a..ceb778a4ce 100644
--- a/Docs/Themes/benches.md
+++ b/Docs/Themes/benches.md
@@ -1,7 +1,7 @@
 
 
- Benches ( benches) 
---------------------
+ Benches ( [benches](https://mapcomplete.osm.be/benches) ) 
+-----------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/bicycle_rental.md b/Docs/Themes/bicycle_rental.md
index 381f6ae15e..cf6da35903 100644
--- a/Docs/Themes/bicycle_rental.md
+++ b/Docs/Themes/bicycle_rental.md
@@ -1,7 +1,7 @@
 
 
- Bicycle rental ( bicycle_rental) 
-----------------------------------
+ Bicycle rental ( [bicycle_rental](https://mapcomplete.osm.be/bicycle_rental) ) 
+--------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/bicyclelib.md b/Docs/Themes/bicyclelib.md
index 81e8b6f391..b6048f3310 100644
--- a/Docs/Themes/bicyclelib.md
+++ b/Docs/Themes/bicyclelib.md
@@ -1,7 +1,7 @@
 
 
- Bicycle libraries ( bicyclelib) 
----------------------------------
+ Bicycle libraries ( [bicyclelib](https://mapcomplete.osm.be/bicyclelib) ) 
+---------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/binoculars.md b/Docs/Themes/binoculars.md
index b4fd209378..d7ba614cb8 100644
--- a/Docs/Themes/binoculars.md
+++ b/Docs/Themes/binoculars.md
@@ -1,7 +1,7 @@
 
 
- Binoculars ( binoculars) 
---------------------------
+ Binoculars ( [binoculars](https://mapcomplete.osm.be/binoculars) ) 
+--------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/blind_osm.md b/Docs/Themes/blind_osm.md
index c54787e740..5d0efba42b 100644
--- a/Docs/Themes/blind_osm.md
+++ b/Docs/Themes/blind_osm.md
@@ -1,7 +1,7 @@
 
 
- OSM for the blind ( blind_osm) 
---------------------------------
+ OSM for the blind ( [blind_osm](https://mapcomplete.osm.be/blind_osm) ) 
+-------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/bookcases.md b/Docs/Themes/bookcases.md
index fa4ebf9614..bbdae85583 100644
--- a/Docs/Themes/bookcases.md
+++ b/Docs/Themes/bookcases.md
@@ -1,7 +1,7 @@
 
 
- Open Bookcase Map ( bookcases) 
---------------------------------
+ Open Bookcase Map ( [bookcases](https://mapcomplete.osm.be/bookcases) ) 
+-------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/buurtnatuur.md b/Docs/Themes/buurtnatuur.md
index e524c664c9..f642231e9d 100644
--- a/Docs/Themes/buurtnatuur.md
+++ b/Docs/Themes/buurtnatuur.md
@@ -1,7 +1,7 @@
 
 
- Breng jouw buurtnatuur in kaart ( buurtnatuur) 
-------------------------------------------------
+ Breng jouw buurtnatuur in kaart ( [buurtnatuur](https://mapcomplete.osm.be/buurtnatuur) ) 
+-------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/cafes_and_pubs.md b/Docs/Themes/cafes_and_pubs.md
index e3a97b525a..e6f8087efb 100644
--- a/Docs/Themes/cafes_and_pubs.md
+++ b/Docs/Themes/cafes_and_pubs.md
@@ -1,7 +1,7 @@
 
 
- Cafés and pubs ( cafes_and_pubs) 
-----------------------------------
+ Cafés and pubs ( [cafes_and_pubs](https://mapcomplete.osm.be/cafes_and_pubs) ) 
+--------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/campersite.md b/Docs/Themes/campersite.md
index 308e0a6961..7dc538d124 100644
--- a/Docs/Themes/campersite.md
+++ b/Docs/Themes/campersite.md
@@ -1,7 +1,7 @@
 
 
- Campersites ( campersite) 
----------------------------
+ Campersites ( [campersite](https://mapcomplete.osm.be/campersite) ) 
+---------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/charging_stations.md b/Docs/Themes/charging_stations.md
index d225b79201..ff38796cd3 100644
--- a/Docs/Themes/charging_stations.md
+++ b/Docs/Themes/charging_stations.md
@@ -1,7 +1,7 @@
 
 
- Charging stations ( charging_stations) 
-----------------------------------------
+ Charging stations ( [charging_stations](https://mapcomplete.osm.be/charging_stations) ) 
+-----------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/climbing.md b/Docs/Themes/climbing.md
index 67c5ac9f8a..0e7bcb2d1a 100644
--- a/Docs/Themes/climbing.md
+++ b/Docs/Themes/climbing.md
@@ -1,7 +1,7 @@
 
 
- Open Climbing Map ( climbing) 
--------------------------------
+ Open Climbing Map ( [climbing](https://mapcomplete.osm.be/climbing) ) 
+-----------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/cycle_highways.md b/Docs/Themes/cycle_highways.md
index 87a954e70f..539d1e90cb 100644
--- a/Docs/Themes/cycle_highways.md
+++ b/Docs/Themes/cycle_highways.md
@@ -1,7 +1,7 @@
 
 
- Cycle highways ( cycle_highways) 
-----------------------------------
+ Cycle highways ( [cycle_highways](https://mapcomplete.osm.be/cycle_highways) ) 
+--------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/cycle_infra.md b/Docs/Themes/cycle_infra.md
index 1b97f38562..c2de49c68c 100644
--- a/Docs/Themes/cycle_infra.md
+++ b/Docs/Themes/cycle_infra.md
@@ -1,7 +1,7 @@
 
 
- Bicycle infrastructure ( cycle_infra) 
----------------------------------------
+ Bicycle infrastructure ( [cycle_infra](https://mapcomplete.osm.be/cycle_infra) ) 
+----------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/cyclenodes.md b/Docs/Themes/cyclenodes.md
index 6b91df51cf..855b602191 100644
--- a/Docs/Themes/cyclenodes.md
+++ b/Docs/Themes/cyclenodes.md
@@ -1,7 +1,7 @@
 
 
- Cycle Node Networks ( cyclenodes) 
------------------------------------
+ Cycle Node Networks ( [cyclenodes](https://mapcomplete.osm.be/cyclenodes) ) 
+-----------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/cyclestreets.md b/Docs/Themes/cyclestreets.md
index fb857e1488..dce922d396 100644
--- a/Docs/Themes/cyclestreets.md
+++ b/Docs/Themes/cyclestreets.md
@@ -1,7 +1,7 @@
 
 
- Cyclestreets ( cyclestreets) 
-------------------------------
+ Cyclestreets ( [cyclestreets](https://mapcomplete.osm.be/cyclestreets) ) 
+--------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/cyclofix.md b/Docs/Themes/cyclofix.md
index cf7c0ebf05..aecea6e254 100644
--- a/Docs/Themes/cyclofix.md
+++ b/Docs/Themes/cyclofix.md
@@ -1,7 +1,7 @@
 
 
- Cyclofix - an open map for cyclists ( cyclofix) 
--------------------------------------------------
+ Cyclofix - an open map for cyclists ( [cyclofix](https://mapcomplete.osm.be/cyclofix) ) 
+-----------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/drinking_water.md b/Docs/Themes/drinking_water.md
index 2858cb6180..6f82e19e69 100644
--- a/Docs/Themes/drinking_water.md
+++ b/Docs/Themes/drinking_water.md
@@ -1,7 +1,7 @@
 
 
- Drinking Water ( drinking_water) 
-----------------------------------
+ Drinking Water ( [drinking_water](https://mapcomplete.osm.be/drinking_water) ) 
+--------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/education.md b/Docs/Themes/education.md
index dc06a84ab7..bcadf0d7a9 100644
--- a/Docs/Themes/education.md
+++ b/Docs/Themes/education.md
@@ -1,7 +1,7 @@
 
 
- Education ( education) 
-------------------------
+ Education ( [education](https://mapcomplete.osm.be/education) ) 
+-----------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/etymology.md b/Docs/Themes/etymology.md
index 398a992a4c..382f18ebcb 100644
--- a/Docs/Themes/etymology.md
+++ b/Docs/Themes/etymology.md
@@ -1,7 +1,7 @@
 
 
- Open Etymology Map ( etymology) 
----------------------------------
+ Open Etymology Map ( [etymology](https://mapcomplete.osm.be/etymology) ) 
+--------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/facadegardens.md b/Docs/Themes/facadegardens.md
index e181927148..d9fca0bb77 100644
--- a/Docs/Themes/facadegardens.md
+++ b/Docs/Themes/facadegardens.md
@@ -1,7 +1,7 @@
 
 
- Facade gardens ( facadegardens) 
----------------------------------
+ Facade gardens ( [facadegardens](https://mapcomplete.osm.be/facadegardens) ) 
+------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/food.md b/Docs/Themes/food.md
index dea99454f9..bee974b969 100644
--- a/Docs/Themes/food.md
+++ b/Docs/Themes/food.md
@@ -1,7 +1,7 @@
 
 
- Restaurants and fast food ( food) 
------------------------------------
+ Restaurants and fast food ( [food](https://mapcomplete.osm.be/food) ) 
+-----------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/fritures.md b/Docs/Themes/fritures.md
index 590a93581a..adb0ebc271 100644
--- a/Docs/Themes/fritures.md
+++ b/Docs/Themes/fritures.md
@@ -1,7 +1,7 @@
 
 
- Fries shops ( fritures) 
--------------------------
+ Fries shops ( [fritures](https://mapcomplete.osm.be/fritures) ) 
+-----------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/fruit_trees.md b/Docs/Themes/fruit_trees.md
index 045420226c..8aadb85b91 100644
--- a/Docs/Themes/fruit_trees.md
+++ b/Docs/Themes/fruit_trees.md
@@ -1,7 +1,7 @@
 
 
- Open Boomgaardenkaart ( fruit_trees) 
---------------------------------------
+ Open Boomgaardenkaart ( [fruit_trees](https://mapcomplete.osm.be/fruit_trees) ) 
+---------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/ghostbikes.md b/Docs/Themes/ghostbikes.md
index 7d0195cbd6..c5db166580 100644
--- a/Docs/Themes/ghostbikes.md
+++ b/Docs/Themes/ghostbikes.md
@@ -1,7 +1,7 @@
 
 
- Ghost bikes ( ghostbikes) 
----------------------------
+ Ghost bikes ( [ghostbikes](https://mapcomplete.osm.be/ghostbikes) ) 
+---------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/grb.md b/Docs/Themes/grb.md
index 79b1a531e1..511073458e 100644
--- a/Docs/Themes/grb.md
+++ b/Docs/Themes/grb.md
@@ -1,7 +1,7 @@
 
 
- GRB import helper ( grb) 
---------------------------
+ GRB import helper ( [grb](https://mapcomplete.osm.be/grb) ) 
+-------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/grb_fixme.md b/Docs/Themes/grb_fixme.md
index fc0850e531..b94c0cfe47 100644
--- a/Docs/Themes/grb_fixme.md
+++ b/Docs/Themes/grb_fixme.md
@@ -1,7 +1,7 @@
 
 
- GRB Fixup ( grb_fixme) 
-------------------------
+ GRB Fixup ( [grb_fixme](https://mapcomplete.osm.be/grb_fixme) ) 
+-----------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/hackerspaces.md b/Docs/Themes/hackerspaces.md
index 697dfcac69..be842393d7 100644
--- a/Docs/Themes/hackerspaces.md
+++ b/Docs/Themes/hackerspaces.md
@@ -1,7 +1,7 @@
 
 
- Hackerspaces ( hackerspaces) 
-------------------------------
+ Hackerspaces ( [hackerspaces](https://mapcomplete.osm.be/hackerspaces) ) 
+--------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/hailhydrant.md b/Docs/Themes/hailhydrant.md
index b10d83fdca..5f259b545c 100644
--- a/Docs/Themes/hailhydrant.md
+++ b/Docs/Themes/hailhydrant.md
@@ -1,7 +1,7 @@
 
 
- Hydrants, Extinguishers, Fire stations, and Ambulance stations ( hailhydrant) 
--------------------------------------------------------------------------------
+ Hydrants, Extinguishers, Fire stations, and Ambulance stations ( [hailhydrant](https://mapcomplete.osm.be/hailhydrant) ) 
+--------------------------------------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/healthcare.md b/Docs/Themes/healthcare.md
index e5a43b8d7b..3689870c32 100644
--- a/Docs/Themes/healthcare.md
+++ b/Docs/Themes/healthcare.md
@@ -1,7 +1,7 @@
 
 
- Healthcare ( healthcare) 
---------------------------
+ Healthcare ( [healthcare](https://mapcomplete.osm.be/healthcare) ) 
+--------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/hotels.md b/Docs/Themes/hotels.md
index 0db174f82e..78d685153e 100644
--- a/Docs/Themes/hotels.md
+++ b/Docs/Themes/hotels.md
@@ -1,7 +1,7 @@
 
 
- Hotels ( hotels) 
-------------------
+ Hotels ( [hotels](https://mapcomplete.osm.be/hotels) ) 
+--------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/indoors.md b/Docs/Themes/indoors.md
index 2532e72b1f..20ed154805 100644
--- a/Docs/Themes/indoors.md
+++ b/Docs/Themes/indoors.md
@@ -1,7 +1,7 @@
 
 
- Indoors ( indoors) 
---------------------
+ Indoors ( [indoors](https://mapcomplete.osm.be/indoors) ) 
+-----------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/kerbs_and_crossings.md b/Docs/Themes/kerbs_and_crossings.md
index 8f2b0329c5..0c91accaf5 100644
--- a/Docs/Themes/kerbs_and_crossings.md
+++ b/Docs/Themes/kerbs_and_crossings.md
@@ -1,7 +1,7 @@
 
 
- Kerbs and crossings ( kerbs_and_crossings) 
---------------------------------------------
+ Kerbs and crossings ( [kerbs_and_crossings](https://mapcomplete.osm.be/kerbs_and_crossings) ) 
+-----------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/mapcomplete-changes.md b/Docs/Themes/mapcomplete-changes.md
index cd756f707d..cd144bd582 100644
--- a/Docs/Themes/mapcomplete-changes.md
+++ b/Docs/Themes/mapcomplete-changes.md
@@ -1,7 +1,7 @@
 
 
- Changes made with MapComplete ( mapcomplete-changes) 
-------------------------------------------------------
+ Changes made with MapComplete ( [mapcomplete-changes](https://mapcomplete.osm.be/mapcomplete-changes) ) 
+---------------------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/maproulette.md b/Docs/Themes/maproulette.md
index 8ce21e37b9..456bbf001a 100644
--- a/Docs/Themes/maproulette.md
+++ b/Docs/Themes/maproulette.md
@@ -1,7 +1,7 @@
 
 
- MapRoulette Tasks ( maproulette) 
-----------------------------------
+ MapRoulette Tasks ( [maproulette](https://mapcomplete.osm.be/maproulette) ) 
+-----------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/maps.md b/Docs/Themes/maps.md
index 0d03a5e81f..327250bbd7 100644
--- a/Docs/Themes/maps.md
+++ b/Docs/Themes/maps.md
@@ -1,7 +1,7 @@
 
 
- A map of maps ( maps) 
------------------------
+ A map of maps ( [maps](https://mapcomplete.osm.be/maps) ) 
+-----------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/maxspeed.md b/Docs/Themes/maxspeed.md
index dcabaf055b..def3a5c635 100644
--- a/Docs/Themes/maxspeed.md
+++ b/Docs/Themes/maxspeed.md
@@ -1,7 +1,7 @@
 
 
- Maxspeed ( maxspeed) 
-----------------------
+ Maxspeed ( [maxspeed](https://mapcomplete.osm.be/maxspeed) ) 
+--------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/nature.md b/Docs/Themes/nature.md
index b3b9e2ae66..97792e13c7 100644
--- a/Docs/Themes/nature.md
+++ b/Docs/Themes/nature.md
@@ -1,7 +1,7 @@
 
 
- Into nature ( nature) 
------------------------
+ Into nature ( [nature](https://mapcomplete.osm.be/nature) ) 
+-------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/natuurpunt.md b/Docs/Themes/natuurpunt.md
index 76849239b4..01b10ece49 100644
--- a/Docs/Themes/natuurpunt.md
+++ b/Docs/Themes/natuurpunt.md
@@ -1,7 +1,7 @@
 
 
- The map of Natuurpunt ( natuurpunt) 
--------------------------------------
+ The map of Natuurpunt ( [natuurpunt](https://mapcomplete.osm.be/natuurpunt) ) 
+-------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/notes.md b/Docs/Themes/notes.md
index d0f6c648a7..76b2329666 100644
--- a/Docs/Themes/notes.md
+++ b/Docs/Themes/notes.md
@@ -1,7 +1,7 @@
 
 
- Notes on OpenStreetMap ( notes) 
----------------------------------
+ Notes on OpenStreetMap ( [notes](https://mapcomplete.osm.be/notes) ) 
+----------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/observation_towers.md b/Docs/Themes/observation_towers.md
index e9cf84e740..f215b0c598 100644
--- a/Docs/Themes/observation_towers.md
+++ b/Docs/Themes/observation_towers.md
@@ -1,7 +1,7 @@
 
 
- Observation towers ( observation_towers) 
-------------------------------------------
+ Observation towers ( [observation_towers](https://mapcomplete.osm.be/observation_towers) ) 
+--------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/onwheels.md b/Docs/Themes/onwheels.md
index 3388996bff..024a0d5c84 100644
--- a/Docs/Themes/onwheels.md
+++ b/Docs/Themes/onwheels.md
@@ -1,7 +1,7 @@
 
 
- OnWheels ( onwheels) 
-----------------------
+ OnWheels ( [onwheels](https://mapcomplete.osm.be/onwheels) ) 
+--------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/openwindpowermap.md b/Docs/Themes/openwindpowermap.md
index 07ab9da3dd..9ae7849ff5 100644
--- a/Docs/Themes/openwindpowermap.md
+++ b/Docs/Themes/openwindpowermap.md
@@ -1,7 +1,7 @@
 
 
- OpenWindPowerMap ( openwindpowermap) 
---------------------------------------
+ OpenWindPowerMap ( [openwindpowermap](https://mapcomplete.osm.be/openwindpowermap) ) 
+--------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/osm_community_index.md b/Docs/Themes/osm_community_index.md
index c3e271c5a9..39555ca2fb 100644
--- a/Docs/Themes/osm_community_index.md
+++ b/Docs/Themes/osm_community_index.md
@@ -1,7 +1,7 @@
 
 
- OSM Community Index ( osm_community_index) 
---------------------------------------------
+ OSM Community Index ( [osm_community_index](https://mapcomplete.osm.be/osm_community_index) ) 
+-----------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/parkings.md b/Docs/Themes/parkings.md
index 0915329ad5..d4df670948 100644
--- a/Docs/Themes/parkings.md
+++ b/Docs/Themes/parkings.md
@@ -1,7 +1,7 @@
 
 
- Parking ( parkings) 
----------------------
+ Parking ( [parkings](https://mapcomplete.osm.be/parkings) ) 
+-------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/personal.md b/Docs/Themes/personal.md
index ea90d6ed7a..4250ceffce 100644
--- a/Docs/Themes/personal.md
+++ b/Docs/Themes/personal.md
@@ -1,7 +1,7 @@
 
 
- Personal theme ( personal) 
-----------------------------
+ Personal theme ( [personal](https://mapcomplete.osm.be/personal) ) 
+--------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/pets.md b/Docs/Themes/pets.md
index d2c4b99b1b..db525143cc 100644
--- a/Docs/Themes/pets.md
+++ b/Docs/Themes/pets.md
@@ -1,7 +1,7 @@
 
 
- Veterinarians, dog parks and other pet-amenities ( pets) 
-----------------------------------------------------------
+ Veterinarians, dog parks and other pet-amenities ( [pets](https://mapcomplete.osm.be/pets) ) 
+----------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/play_forests.md b/Docs/Themes/play_forests.md
index 0f6597e2bc..9f4b7bb07c 100644
--- a/Docs/Themes/play_forests.md
+++ b/Docs/Themes/play_forests.md
@@ -1,7 +1,7 @@
 
 
- Speelbossen ( play_forests) 
------------------------------
+ Speelbossen ( [play_forests](https://mapcomplete.osm.be/play_forests) ) 
+-------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/playgrounds.md b/Docs/Themes/playgrounds.md
index 077b85b154..d003151790 100644
--- a/Docs/Themes/playgrounds.md
+++ b/Docs/Themes/playgrounds.md
@@ -1,7 +1,7 @@
 
 
- Playgrounds ( playgrounds) 
-----------------------------
+ Playgrounds ( [playgrounds](https://mapcomplete.osm.be/playgrounds) ) 
+-----------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/postal_codes.md b/Docs/Themes/postal_codes.md
index fa88065b6e..34378bbd51 100644
--- a/Docs/Themes/postal_codes.md
+++ b/Docs/Themes/postal_codes.md
@@ -1,7 +1,7 @@
 
 
- Postal codes ( postal_codes) 
-------------------------------
+ Postal codes ( [postal_codes](https://mapcomplete.osm.be/postal_codes) ) 
+--------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/postboxes.md b/Docs/Themes/postboxes.md
index 05dd753949..2f64e7b437 100644
--- a/Docs/Themes/postboxes.md
+++ b/Docs/Themes/postboxes.md
@@ -1,7 +1,7 @@
 
 
- Postbox and Post Office Map ( postboxes) 
-------------------------------------------
+ Postbox and Post Office Map ( [postboxes](https://mapcomplete.osm.be/postboxes) ) 
+-----------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/rainbow_crossings.md b/Docs/Themes/rainbow_crossings.md
index 0fa1fca9ea..16f0f76696 100644
--- a/Docs/Themes/rainbow_crossings.md
+++ b/Docs/Themes/rainbow_crossings.md
@@ -1,7 +1,7 @@
 
 
- Rainbow pedestrian crossings ( rainbow_crossings) 
----------------------------------------------------
+ Rainbow pedestrian crossings ( [rainbow_crossings](https://mapcomplete.osm.be/rainbow_crossings) ) 
+----------------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/shops.md b/Docs/Themes/shops.md
index edf6a18906..e7d249dc6d 100644
--- a/Docs/Themes/shops.md
+++ b/Docs/Themes/shops.md
@@ -1,7 +1,7 @@
 
 
- Open Shop Map ( shops) 
-------------------------
+ Open Shop Map ( [shops](https://mapcomplete.osm.be/shops) ) 
+-------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/sidewalks.md b/Docs/Themes/sidewalks.md
index a17af10144..8f8a5b2bbb 100644
--- a/Docs/Themes/sidewalks.md
+++ b/Docs/Themes/sidewalks.md
@@ -1,7 +1,7 @@
 
 
- Sidewalks ( sidewalks) 
-------------------------
+ Sidewalks ( [sidewalks](https://mapcomplete.osm.be/sidewalks) ) 
+-----------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/speelplekken.md b/Docs/Themes/speelplekken.md
index 5c89efc5aa..01c2538ebf 100644
--- a/Docs/Themes/speelplekken.md
+++ b/Docs/Themes/speelplekken.md
@@ -1,7 +1,7 @@
 
 
- Welkom bij de groendoener! ( speelplekken) 
---------------------------------------------
+ Welkom bij de groendoener! ( [speelplekken](https://mapcomplete.osm.be/speelplekken) ) 
+----------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/sport_pitches.md b/Docs/Themes/sport_pitches.md
index 2518620382..0b9cb73b45 100644
--- a/Docs/Themes/sport_pitches.md
+++ b/Docs/Themes/sport_pitches.md
@@ -1,7 +1,7 @@
 
 
- Sport pitches ( sport_pitches) 
---------------------------------
+ Sport pitches ( [sport_pitches](https://mapcomplete.osm.be/sport_pitches) ) 
+-----------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/sports.md b/Docs/Themes/sports.md
index 3a5177a507..bf6674003f 100644
--- a/Docs/Themes/sports.md
+++ b/Docs/Themes/sports.md
@@ -1,7 +1,7 @@
 
 
- Sports ( sports) 
-------------------
+ Sports ( [sports](https://mapcomplete.osm.be/sports) ) 
+--------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/stations.md b/Docs/Themes/stations.md
index 6e0b2cb9d2..879855efdd 100644
--- a/Docs/Themes/stations.md
+++ b/Docs/Themes/stations.md
@@ -1,7 +1,7 @@
 
 
- Train Stations ( stations) 
-----------------------------
+ Train Stations ( [stations](https://mapcomplete.osm.be/stations) ) 
+--------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/street_lighting.md b/Docs/Themes/street_lighting.md
index c281851c00..419a1bd48f 100644
--- a/Docs/Themes/street_lighting.md
+++ b/Docs/Themes/street_lighting.md
@@ -1,7 +1,7 @@
 
 
- Street Lighting ( street_lighting) 
-------------------------------------
+ Street Lighting ( [street_lighting](https://mapcomplete.osm.be/street_lighting) ) 
+-----------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/street_lighting_assen.md b/Docs/Themes/street_lighting_assen.md
index 668b15152e..fe7b52adf3 100644
--- a/Docs/Themes/street_lighting_assen.md
+++ b/Docs/Themes/street_lighting_assen.md
@@ -1,7 +1,7 @@
 
 
- Straatverlichting - Assen ( street_lighting_assen) 
-----------------------------------------------------
+ Straatverlichting - Assen ( [street_lighting_assen](https://mapcomplete.osm.be/street_lighting_assen) ) 
+---------------------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/surveillance.md b/Docs/Themes/surveillance.md
index e7e04f1af8..0ce72604ce 100644
--- a/Docs/Themes/surveillance.md
+++ b/Docs/Themes/surveillance.md
@@ -1,7 +1,7 @@
 
 
- Surveillance under Surveillance ( surveillance) 
--------------------------------------------------
+ Surveillance under Surveillance ( [surveillance](https://mapcomplete.osm.be/surveillance) ) 
+---------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/toerisme_vlaanderen.md b/Docs/Themes/toerisme_vlaanderen.md
index 7770aa81a9..94c93bef14 100644
--- a/Docs/Themes/toerisme_vlaanderen.md
+++ b/Docs/Themes/toerisme_vlaanderen.md
@@ -1,7 +1,7 @@
 
 
- Pin je punt ( toerisme_vlaanderen) 
-------------------------------------
+ Pin je punt ( [toerisme_vlaanderen](https://mapcomplete.osm.be/toerisme_vlaanderen) ) 
+---------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/toilets.md b/Docs/Themes/toilets.md
index c2d0f15389..e9a291af75 100644
--- a/Docs/Themes/toilets.md
+++ b/Docs/Themes/toilets.md
@@ -1,7 +1,7 @@
 
 
- Open Toilet Map ( toilets) 
-----------------------------
+ Open Toilet Map ( [toilets](https://mapcomplete.osm.be/toilets) ) 
+-------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/transit.md b/Docs/Themes/transit.md
index d25f76126b..31bdc5208d 100644
--- a/Docs/Themes/transit.md
+++ b/Docs/Themes/transit.md
@@ -1,7 +1,7 @@
 
 
- Bus routes ( transit) 
------------------------
+ Bus routes ( [transit](https://mapcomplete.osm.be/transit) ) 
+--------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/trees.md b/Docs/Themes/trees.md
index 6deaccca5c..095d7d8d7e 100644
--- a/Docs/Themes/trees.md
+++ b/Docs/Themes/trees.md
@@ -1,7 +1,7 @@
 
 
- Trees ( trees) 
-----------------
+ Trees ( [trees](https://mapcomplete.osm.be/trees) ) 
+-----------------------------------------------------
 
 
 
diff --git a/Docs/Themes/uk_addresses.md b/Docs/Themes/uk_addresses.md
index 51dc228f32..8200d94908 100644
--- a/Docs/Themes/uk_addresses.md
+++ b/Docs/Themes/uk_addresses.md
@@ -1,7 +1,7 @@
 
 
- Addresses in Great Britain ( uk_addresses) 
---------------------------------------------
+ Addresses in Great Britain ( [uk_addresses](https://mapcomplete.osm.be/uk_addresses) ) 
+----------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/walls_and_buildings.md b/Docs/Themes/walls_and_buildings.md
index 02ce4d7b3d..ed686cae5c 100644
--- a/Docs/Themes/walls_and_buildings.md
+++ b/Docs/Themes/walls_and_buildings.md
@@ -1,7 +1,7 @@
 
 
- Walls and buildings ( walls_and_buildings) 
---------------------------------------------
+ Walls and buildings ( [walls_and_buildings](https://mapcomplete.osm.be/walls_and_buildings) ) 
+-----------------------------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/waste.md b/Docs/Themes/waste.md
index 24b7d85244..298cc7ea4f 100644
--- a/Docs/Themes/waste.md
+++ b/Docs/Themes/waste.md
@@ -1,7 +1,7 @@
 
 
- Waste ( waste) 
-----------------
+ Waste ( [waste](https://mapcomplete.osm.be/waste) ) 
+-----------------------------------------------------
 
 
 
diff --git a/Docs/Themes/waste_assen.md b/Docs/Themes/waste_assen.md
index 91ba3061f4..12deed5417 100644
--- a/Docs/Themes/waste_assen.md
+++ b/Docs/Themes/waste_assen.md
@@ -1,7 +1,7 @@
 
 
- Afval - Assen ( waste_assen) 
-------------------------------
+ Afval - Assen ( [waste_assen](https://mapcomplete.osm.be/waste_assen) ) 
+-------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/waste_basket.md b/Docs/Themes/waste_basket.md
index 16ad079bf4..b4d51447aa 100644
--- a/Docs/Themes/waste_basket.md
+++ b/Docs/Themes/waste_basket.md
@@ -1,7 +1,7 @@
 
 
- Waste Basket ( waste_basket) 
-------------------------------
+ Waste Basket ( [waste_basket](https://mapcomplete.osm.be/waste_basket) ) 
+--------------------------------------------------------------------------
 
 
 
diff --git a/Docs/Themes/width.md b/Docs/Themes/width.md
index e06daf1bf6..c13ff36fab 100644
--- a/Docs/Themes/width.md
+++ b/Docs/Themes/width.md
@@ -1,7 +1,7 @@
 
 
- Straatbreedtes ( width) 
--------------------------
+ Straatbreedtes ( [width](https://mapcomplete.osm.be/width) ) 
+--------------------------------------------------------------