diff --git a/assets/layers/kerbs/kerbs.json b/assets/layers/kerbs/kerbs.json
index a9f20f6de..777555eb0 100644
--- a/assets/layers/kerbs/kerbs.json
+++ b/assets/layers/kerbs/kerbs.json
@@ -150,8 +150,8 @@
         "nl": "Hoe hoog is deze stoeprand?"
       },
       "render": {
-        "en": "Kerb height: {{kerb:height}}",
-        "nl": "Stoeprandhoogte: {{kerb:height}}"
+        "en": "Kerb height: {kerb:height}",
+        "nl": "Stoeprandhoogte: {kerb:height}"
       },
       "freeform": {
         "key": "kerb:height",
diff --git a/assets/layers/parking/parking.json b/assets/layers/parking/parking.json
index 4490ad695..27159a450 100644
--- a/assets/layers/parking/parking.json
+++ b/assets/layers/parking/parking.json
@@ -139,8 +139,8 @@
         "nl": "Hoeveel parkeerplaatsen voor gehandicapten zijn er op deze parking?"
       },
       "render": {
-        "en": "There are {{capacity:disabled}} disabled parking spots",
-        "nl": "Er zijn {{capacity:disabled}} parkeerplaatsen voor gehandicapten"
+        "en": "There are {capacity:disabled} disabled parking spots",
+        "nl": "Er zijn capacity:disabled} parkeerplaatsen voor gehandicapten"
       }
     },
     {
@@ -158,8 +158,8 @@
         "nl": "Hoeveel parkeerplaatsen zijn er op deze parking?"
       },
       "render": {
-        "en": "There are {{capacity}} parking spots",
-        "nl": "Er zijn {{capacity}} parkeerplaatsen"
+        "en": "There are {capacity} parking spots",
+        "nl": "Er zijn {capacity} parkeerplaatsen"
       }
     }
   ],
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index c21ef5df7..143288b53 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -1,13 +1,16 @@
 {
   "id": "mapcomplete-changes",
   "title": {
-    "en": "Changes made with MapComplete"
+    "en": "Changes made with MapComplete",
+    "nl": "Wijzigingen gemaakt met MapComplete"
   },
   "shortDescription": {
-    "en": "Shows changes made by MapComplete"
+    "en": "Shows changes made by MapComplete",
+    "nl": "Toont wijzigingen gemaakt met MapComplete"
   },
   "description": {
-    "en": "This maps shows all the changes made with MapComplete"
+    "en": "This maps shows all the changes made with MapComplete",
+    "nl": "Deze kaart toont alle wijzigingen die met MapComplete werden gemaakt"
   },
   "maintainer": "",
   "icon": "./assets/svg/logo.svg",
@@ -36,35 +39,41 @@
       ],
       "title": {
         "render": {
-          "en": "Changeset for {theme}"
+          "en": "Changeset for {theme}",
+          "nl": "Wijzigingset voor {theme}"
         }
       },
       "description": {
-        "en": "Shows all MapComplete changes"
+        "en": "Shows all MapComplete changes",
+        "nl": "Toont alle wijzigingen met MapComplete"
       },
       "tagRenderings": [
         {
           "id": "render_id",
           "render": {
-            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
+            "en": "Changeset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>",
+            "nl": "Wijzigingset <a href='https://openstreetmap.org/changeset/{id}' target='_blank'>{id}</a>"
           }
         },
         {
           "id": "contributor",
           "render": {
-            "en": "Change made by <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>"
+            "en": "Change made by <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>",
+            "nl": "Wijziging gemaakt door <a href='https://openstreetmap.org/user/{_last_edit:contributor}' target='_blank'>{_last_edit:contributor}</a>"
           }
         },
         {
           "id": "theme",
           "render": {
-            "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
+            "en": "Change with theme <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>",
+            "nl": "Wijziging met thema <a href='https://mapcomplete.osm.be/{theme}'>{theme}</a>"
           },
           "mappings": [
             {
               "if": "theme~http.*",
               "then": {
-                "en": "Change with <b>unofficial</b> theme <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>"
+                "en": "Change with <b>unofficial</b> theme <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>",
+                "nl": "Wijziging met <b>officieus</b> thema <a href='https://mapcomplete.osm.be/theme.html?userlayout={theme}'>{theme}</a>"
               }
             }
           ]
@@ -344,7 +353,8 @@
                 }
               ],
               "question": {
-                "en": "Themename contains {search}"
+                "en": "Themename contains {search}",
+                "nl": "Themanaam bevat {search}"
               }
             }
           ]
@@ -360,7 +370,8 @@
                 }
               ],
               "question": {
-                "en": "Made by contributor {search}"
+                "en": "Made by contributor {search}",
+                "nl": "Gemaakt door bijdrager {search}"
               }
             }
           ]
@@ -376,7 +387,8 @@
                 }
               ],
               "question": {
-                "en": "<b>Not</b> made by contributor {search}"
+                "en": "<b>Not</b> made by contributor {search}",
+                "nl": "<b>Niet</b> gemaakt door bijdrager {search}"
               }
             }
           ]
@@ -391,7 +403,8 @@
           {
             "id": "link_to_more",
             "render": {
-              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>"
+              "en": "More statistics can be found <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>here</a>",
+              "nl": "Meer statistieken kunnen <a href='https://github.com/pietervdvn/MapComplete/tree/develop/Docs/Tools/graphs' target='_blank'>hier</a> gevonden worden"
             }
           },
           {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 893237ebd..e132473ac 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -4127,7 +4127,7 @@
                     "placeholder": "Height of the kerb"
                 },
                 "question": "What is the height of this kerb?",
-                "render": "Kerb height: {{kerb:height}}"
+                "render": "Kerb height: {kerb:height}"
             },
             "kerb-type": {
                 "mappings": {
@@ -4627,7 +4627,7 @@
                     "placeholder": "Amount of parking spots"
                 },
                 "question": "How many parking spots are there at this parking?",
-                "render": "There are {{capacity}} parking spots"
+                "render": "There are {capacity} parking spots"
             },
             "capacity-disabled": {
                 "freeform": {
@@ -4642,7 +4642,7 @@
                     }
                 },
                 "question": "How many disabled parking spots are there at this parking?",
-                "render": "There are {{capacity:disabled}} disabled parking spots"
+                "render": "There are {capacity:disabled} disabled parking spots"
             },
             "parking-type": {
                 "mappings": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 66ad00a5d..990c97288 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -4035,7 +4035,7 @@
                     "placeholder": "Hoogte van de stoeprand"
                 },
                 "question": "Hoe hoog is deze stoeprand?",
-                "render": "Stoeprandhoogte: {{kerb:height}}"
+                "render": "Stoeprandhoogte: {kerb:height}"
             },
             "kerb-type": {
                 "mappings": {
@@ -4511,7 +4511,7 @@
                     "placeholder": "Aantal parkeerplaatsen"
                 },
                 "question": "Hoeveel parkeerplaatsen zijn er op deze parking?",
-                "render": "Er zijn {{capacity}} parkeerplaatsen"
+                "render": "Er zijn {capacity} parkeerplaatsen"
             },
             "capacity-disabled": {
                 "freeform": {
@@ -4526,7 +4526,7 @@
                     }
                 },
                 "question": "Hoeveel parkeerplaatsen voor gehandicapten zijn er op deze parking?",
-                "render": "Er zijn {{capacity:disabled}} parkeerplaatsen voor gehandicapten"
+                "render": "Er zijn capacity:disabled} parkeerplaatsen voor gehandicapten"
             },
             "parking-type": {
                 "mappings": {