diff --git a/assets/layers/charging_station/charging_station.json b/assets/layers/charging_station/charging_station.json
index 1d5bccb6d..132a6710e 100644
--- a/assets/layers/charging_station/charging_station.json
+++ b/assets/layers/charging_station/charging_station.json
@@ -5,7 +5,13 @@
     "nl": "Oplaadpunten",
     "de": "Ladestationen"
   },
-  "minzoom": 10,
+  "description": {
+    "en": "A charging station",
+    "nl": "Oplaadpunten",
+    "ca": "Una estació de càrrega",
+    "de": "Eine Ladestation",
+    "fr": "Une station de recharge"
+  },
   "source": {
     "osmTags": {
       "and": [
@@ -20,6 +26,7 @@
       ]
     }
   },
+  "minzoom": 10,
   "title": {
     "render": {
       "en": "Charging station",
@@ -65,14 +72,109 @@
       }
     ]
   },
-  "description": {
-    "en": "A charging station",
-    "nl": "Oplaadpunten",
-    "ca": "Una estació de càrrega",
-    "de": "Eine Ladestation",
-    "fr": "Une station de recharge"
-  },
-  "#": "no-question-hint-check",
+  "pointRendering": [
+    {
+      "location": [
+        "point",
+        "centroid"
+      ],
+      "marker": [
+        {
+          "icon": "pin",
+          "color": "#fff"
+        },
+        {
+          "icon": {
+            "render": "./assets/themes/charging_stations/plug.svg",
+            "mappings": [
+              {
+                "if": "bicycle=yes",
+                "then": "./assets/themes/charging_stations/bicycle.svg"
+              },
+              {
+                "if": {
+                  "or": [
+                    "car=yes",
+                    "motorcar=yes"
+                  ]
+                },
+                "then": "./assets/themes/charging_stations/car.svg"
+              }
+            ]
+          }
+        }
+      ],
+      "iconBadges": [
+        {
+          "if": {
+            "or": [
+              "disused:amenity=charging_station",
+              "operational_status=broken"
+            ]
+          },
+          "then": "close:#c22;"
+        },
+        {
+          "if": {
+            "or": [
+              "proposed:amenity=charging_station",
+              "planned:amenity=charging_station"
+            ]
+          },
+          "then": "./assets/layers/charging_station/under_construction.svg"
+        },
+        {
+          "if": {
+            "and": [
+              "bicycle=yes",
+              {
+                "or": [
+                  "motorcar=yes",
+                  "car=yes"
+                ]
+              }
+            ]
+          },
+          "then": "circle:#fff;./assets/themes/charging_stations/car.svg"
+        }
+      ],
+      "anchor": "bottom",
+      "iconSize": "50,50"
+    }
+  ],
+  "lineRendering": [
+    {
+      "color": "black",
+      "width": 2,
+      "fillColor": "#80808080"
+    }
+  ],
+  "presets": [
+    {
+      "tags": [
+        "amenity=charging_station",
+        "motorcar=no",
+        "bicycle=yes"
+      ],
+      "title": {
+        "en": "charging station for electrical bikes",
+        "nl": "oplaadpunt voor elektrische fietsen",
+        "de": "Ladestation für Elektrofahrräder"
+      }
+    },
+    {
+      "tags": [
+        "amenity=charging_station",
+        "motorcar=yes",
+        "bicycle=no"
+      ],
+      "title": {
+        "en": "charging station for cars",
+        "nl": "oplaadstation voor elektrische auto's",
+        "de": "Ladestation für Autos"
+      }
+    }
+  ],
   "tagRenderings": [
     "images",
     {
@@ -2778,109 +2880,6 @@
       }
     }
   ],
-  "lineRendering": [
-    {
-      "color": "black",
-      "width": 2,
-      "fillColor": "#80808080"
-    }
-  ],
-  "pointRendering": [
-    {
-      "location": [
-        "point",
-        "centroid"
-      ],
-      "marker": [
-        {
-          "icon": "pin",
-          "color": "#fff"
-        },
-        {
-          "icon": {
-            "render": "./assets/themes/charging_stations/plug.svg",
-            "mappings": [
-              {
-                "if": "bicycle=yes",
-                "then": "./assets/themes/charging_stations/bicycle.svg"
-              },
-              {
-                "if": {
-                  "or": [
-                    "car=yes",
-                    "motorcar=yes"
-                  ]
-                },
-                "then": "./assets/themes/charging_stations/car.svg"
-              }
-            ]
-          }
-        }
-      ],
-      "iconBadges": [
-        {
-          "if": {
-            "or": [
-              "disused:amenity=charging_station",
-              "operational_status=broken"
-            ]
-          },
-          "then": "close:#c22;"
-        },
-        {
-          "if": {
-            "or": [
-              "proposed:amenity=charging_station",
-              "planned:amenity=charging_station"
-            ]
-          },
-          "then": "./assets/layers/charging_station/under_construction.svg"
-        },
-        {
-          "if": {
-            "and": [
-              "bicycle=yes",
-              {
-                "or": [
-                  "motorcar=yes",
-                  "car=yes"
-                ]
-              }
-            ]
-          },
-          "then": "circle:#fff;./assets/themes/charging_stations/car.svg"
-        }
-      ],
-      "anchor": "bottom",
-      "iconSize": "50,50"
-    }
-  ],
-  "presets": [
-    {
-      "tags": [
-        "amenity=charging_station",
-        "motorcar=no",
-        "bicycle=yes"
-      ],
-      "title": {
-        "en": "charging station for electrical bikes",
-        "nl": "oplaadpunt voor elektrische fietsen",
-        "de": "Ladestation für Elektrofahrräder"
-      }
-    },
-    {
-      "tags": [
-        "amenity=charging_station",
-        "motorcar=yes",
-        "bicycle=no"
-      ],
-      "title": {
-        "en": "charging station for cars",
-        "nl": "oplaadstation voor elektrische auto's",
-        "de": "Ladestation für Autos"
-      }
-    }
-  ],
   "filter": [
     {
       "id": "vehicle-type",
@@ -3128,6 +3127,19 @@
       ]
     }
   ],
+  "deletion": {
+    "softDeletionTags": {
+      "and": [
+        "amenity=",
+        "disused:amenity=charging_station"
+      ]
+    },
+    "neededChangesets": 10
+  },
+  "allowMove": {
+    "enableRelocation": false,
+    "enableImproveAccuracy": true
+  },
   "units": [
     {
       "maxstay": {
@@ -3322,17 +3334,5 @@
       }
     }
   ],
-  "allowMove": {
-    "enableRelocation": false,
-    "enableImproveAccuracy": true
-  },
-  "deletion": {
-    "softDeletionTags": {
-      "and": [
-        "amenity=",
-        "disused:amenity=charging_station"
-      ]
-    },
-    "neededChangesets": 10
-  }
-}
\ No newline at end of file
+  "#": "no-question-hint-check"
+}
diff --git a/assets/layers/cycle_highways/cycle_highways.json b/assets/layers/cycle_highways/cycle_highways.json
index dec199887..aed62fb40 100644
--- a/assets/layers/cycle_highways/cycle_highways.json
+++ b/assets/layers/cycle_highways/cycle_highways.json
@@ -1,5 +1,61 @@
 {
   "id": "cycle_highways",
+  "name": {
+    "en": "cycle highways",
+    "de": "Radschnellwege",
+    "ca": "vies ciclistes",
+    "fr": "Aménagements cyclables",
+    "nl": "fietssnelwegen",
+    "es": "autovías ciclistas",
+    "nb_NO": "sykkelmotorveier",
+    "da": "cykelmotorveje",
+    "pa_PK": "سائیکل‌وے",
+    "cs": "cyklodálnice",
+    "pl": "ścieżki rowerowe",
+    "it": "strade per biciclette",
+    "zh_Hant": "單車高速公路"
+  },
+  "source": {
+    "osmTags": "cycle_network=BE-VLG:cycle_highway"
+  },
+  "isCounted": false,
+  "minzoom": 6,
+  "title": {
+    "render": {
+      "en": "cycle highway",
+      "de": "Radschnellweg",
+      "ca": "via ciclista",
+      "fr": "Aménagement cyclable",
+      "nl": "fietssnelweg",
+      "es": "autovía ciclista",
+      "nb_NO": "sykkelmotorvei",
+      "da": "cykelmotorvej",
+      "pa_PK": "سائیکل‌وے",
+      "cs": "cyklodálnice",
+      "pl": "ścieżka rowerowa",
+      "it": "strada per bicilette",
+      "zh_Hant": "單車高速公路"
+    }
+  },
+  "pointRendering": null,
+  "lineRendering": [
+    {
+      "color": {
+        "render": "#ff7392",
+        "mappings": [
+          {
+            "if": "state=",
+            "then": "#00acfc"
+          },
+          {
+            "if": "state=temporary",
+            "then": "#00acfc"
+          }
+        ]
+      },
+      "width": "4"
+    }
+  ],
   "tagRenderings": [
     {
       "render": "The name is <b>{name}</b>",
@@ -69,42 +125,6 @@
     "website",
     "all_tags"
   ],
-  "name": {
-    "en": "cycle highways",
-    "de": "Radschnellwege",
-    "ca": "vies ciclistes",
-    "fr": "Aménagements cyclables",
-    "nl": "fietssnelwegen",
-    "es": "autovías ciclistas",
-    "nb_NO": "sykkelmotorveier",
-    "da": "cykelmotorveje",
-    "pa_PK": "سائیکل‌وے",
-    "cs": "cyklodálnice",
-    "pl": "ścieżki rowerowe",
-    "it": "strade per biciclette",
-    "zh_Hant": "單車高速公路"
-  },
-  "source": {
-    "osmTags": "cycle_network=BE-VLG:cycle_highway"
-  },
-  "minzoom": 6,
-  "title": {
-    "render": {
-      "en": "cycle highway",
-      "de": "Radschnellweg",
-      "ca": "via ciclista",
-      "fr": "Aménagement cyclable",
-      "nl": "fietssnelweg",
-      "es": "autovía ciclista",
-      "nb_NO": "sykkelmotorvei",
-      "da": "cykelmotorvej",
-      "pa_PK": "سائیکل‌وے",
-      "cs": "cyklodálnice",
-      "pl": "ścieżka rowerowa",
-      "it": "strada per bicilette",
-      "zh_Hant": "單車高速公路"
-    }
-  },
   "filter": [
     {
       "id": "name-alt",
@@ -192,25 +212,5 @@
         }
       ]
     }
-  ],
-  "pointRendering": null,
-  "isCounted": false,
-  "lineRendering": [
-    {
-      "color": {
-        "render": "#ff7392",
-        "mappings": [
-          {
-            "if": "state=",
-            "then": "#00acfc"
-          },
-          {
-            "if": "state=temporary",
-            "then": "#00acfc"
-          }
-        ]
-      },
-      "width": "4"
-    }
   ]
 }
diff --git a/assets/themes/mapcomplete-changes/mapcomplete-changes.json b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
index 7873f6b66..afc62363b 100644
--- a/assets/themes/mapcomplete-changes/mapcomplete-changes.json
+++ b/assets/themes/mapcomplete-changes/mapcomplete-changes.json
@@ -3,17 +3,14 @@
   "title": {
     "en": "Changes made with MapComplete"
   },
-  "shortDescription": {
-    "en": "Shows changes made by MapComplete"
-  },
   "description": {
     "en": "This maps shows all the changes made with MapComplete"
   },
+  "shortDescription": {
+    "en": "Shows changes made by MapComplete"
+  },
   "icon": "./assets/svg/logo.svg",
   "hideFromOverview": true,
-  "startLat": 0,
-  "startLon": 0,
-  "startZoom": 1,
   "layers": [
     {
       "id": "mapcomplete-changes",