diff --git a/langs/layers/de.json b/langs/layers/de.json
index 6a8517c64d..3d8d65bd4a 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -1,4 +1,26 @@
 {
+    "address": {
+        "description": "Adressen",
+        "name": "Bekannte Adressen in OSM",
+        "tagRenderings": {
+            "housenumber": {
+                "mappings": {
+                    "0": {
+                        "then": "Dieses Gebäude hat keine Hausnummer"
+                    }
+                },
+                "question": "Wie lautet die Nummer dieses Hauses?",
+                "render": "Die Hausnummer ist <b>{addr:housenumber}</b>"
+            },
+            "street": {
+                "question": "In welcher Straße befindet sich diese Adresse?",
+                "render": "Diese Adresse befindet sich in der Straße <b>{addr:street}</b>"
+            }
+        },
+        "title": {
+            "render": "Bekannte Adresse"
+        }
+    },
     "ambulancestation": {
         "description": "Eine Rettungswache ist ein Ort, an dem Rettungsfahrzeuge, medizinische Ausrüstung, persönliche Schutzausrüstung und anderes medizinisches Material untergebracht sind.",
         "name": "Karte der Rettungswachen",
diff --git a/langs/layers/en.json b/langs/layers/en.json
index 88dfb14c9d..269a37c64c 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -1,4 +1,29 @@
 {
+    "address": {
+        "description": "Addresses",
+        "name": "Known addresses in OSM",
+        "tagRenderings": {
+            "fixme": {
+                "question": "What should be fixed here? Please explain"
+            },
+            "housenumber": {
+                "mappings": {
+                    "0": {
+                        "then": "This building has no house number"
+                    }
+                },
+                "question": "What is the number of this house?",
+                "render": "The housenumber is <b>{addr:housenumber}</b>"
+            },
+            "street": {
+                "question": "What street is this address located in?",
+                "render": "This address is in street <b>{addr:street}</b>"
+            }
+        },
+        "title": {
+            "render": "Known address"
+        }
+    },
     "ambulancestation": {
         "description": "An ambulance station is an area for storage of ambulance vehicles, medical equipment, personal protective equipment, and other medical supplies.",
         "name": "Map of ambulance stations",
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 579329cb9f..23311b3080 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -1,4 +1,17 @@
 {
+    "address": {
+        "description": "Adressen",
+        "tagRenderings": {
+            "housenumber": {
+                "mappings": {
+                    "0": {
+                        "then": "Dit gebouw heeft geen huisnummer"
+                    }
+                },
+                "render": "Het huisnummer is <b>{addr:housenumber}</b>"
+            }
+        }
+    },
     "artwork": {
         "description": "Verschillende soorten kunstwerken",
         "name": "Kunstwerken",
@@ -2042,6 +2055,13 @@
             }
         }
     },
+    "crab_address": {
+        "tagRenderings": {
+            "render_crab": {
+                "render": "Volgens het CRAB ligt hier <b>{STRAATNM}</b> {HUISNR} (label: {HNRLABEL})"
+            }
+        }
+    },
     "crossings": {
         "description": "Oversteekplaatsen voor voetgangers en fietsers",
         "name": "Oversteekplaatsen",
diff --git a/langs/layers/ru.json b/langs/layers/ru.json
index 3308f21f87..c5a80b4139 100644
--- a/langs/layers/ru.json
+++ b/langs/layers/ru.json
@@ -1,4 +1,7 @@
 {
+    "address": {
+        "description": "Адреса"
+    },
     "ambulancestation": {
         "name": "Карта станций скорой помощи",
         "presets": {
diff --git a/langs/themes/de.json b/langs/themes/de.json
index 6c811cc9d1..b28226b2bc 100644
--- a/langs/themes/de.json
+++ b/langs/themes/de.json
@@ -1016,8 +1016,6 @@
         "description": "Tragen Sie zu OpenStreetMap bei, indem Sie Adressinformationen ausfüllen",
         "layers": {
             "2": {
-                "description": "Adressen",
-                "name": "Bekannte Adressen in OSM",
                 "tagRenderings": {
                     "uk_addresses_explanation_osm": {
                         "render": "Diese Adresse ist in OpenStreetMap gespeichert"
@@ -1035,9 +1033,6 @@
                         "question": "In welcher Straße befindet sich diese Adresse?",
                         "render": "Diese Adresse befindet sich in der Straße <b>{addr:street}</b>"
                     }
-                },
-                "title": {
-                    "render": "Bekannte Adresse"
                 }
             }
         },
diff --git a/langs/themes/en.json b/langs/themes/en.json
index 3823d6d27a..a264026d0c 100644
--- a/langs/themes/en.json
+++ b/langs/themes/en.json
@@ -843,6 +843,17 @@
             }
         }
     },
+    "grb_fixme": {
+        "layers": {
+            "0": {
+                "tagRenderings": {
+                    "building type": {
+                        "question": "What kind of building is this?"
+                    }
+                }
+            }
+        }
+    },
     "hackerspaces": {
         "description": "On this map you can see hackerspaces, add a new hackerspace or update data directly",
         "layers": {
@@ -1190,8 +1201,6 @@
                 }
             },
             "2": {
-                "description": "Addresses",
-                "name": "Known addresses in OSM",
                 "tagRenderings": {
                     "address-sign-image": {
                         "render": "{image_carousel(image:address)}<br/>{image_upload(image:address, Add image of the address)}"
@@ -1215,9 +1224,6 @@
                         "question": "What street is this address located in?",
                         "render": "This address is in street <b>{addr:street}</b>"
                     }
-                },
-                "title": {
-                    "render": "Known address"
                 }
             }
         },
diff --git a/langs/themes/nl.json b/langs/themes/nl.json
index d69c60b79b..ba08fa2afa 100644
--- a/langs/themes/nl.json
+++ b/langs/themes/nl.json
@@ -751,7 +751,7 @@
         "title": "Witte Fietsen"
     },
     "grb": {
-        "description": "GRB Fixup",
+        "description": "Dit thema helpt het GRB importeren.",
         "layers": {
             "1": {
                 "tagRenderings": {
@@ -787,6 +787,46 @@
                 }
             }
         },
+        "shortDescription": "Grb import helper tool",
+        "title": "GRB import helper"
+    },
+    "grb_fixme": {
+        "description": "Gebouwen met een FIXME - wss GRB-import die gefixed moeten worden",
+        "layers": {
+            "0": {
+                "tagRenderings": {
+                    "grb-fixme": {
+                        "mappings": {
+                            "0": {
+                                "then": "Geen fixme"
+                            }
+                        },
+                        "question": "Wat zegt de fixme?",
+                        "render": "De fixme is <b>{fixme}</b>"
+                    },
+                    "grb-housenumber": {
+                        "mappings": {
+                            "0": {
+                                "then": "Geen huisnummer"
+                            }
+                        },
+                        "question": "Wat is het huisnummer?",
+                        "render": "Het huisnummer is <b>{addr:housenumber}</b>"
+                    },
+                    "grb-min-level": {
+                        "question": "Hoeveel verdiepingen ontbreken?",
+                        "render": "Dit gebouw begint maar op de {building:min_level} verdieping"
+                    },
+                    "grb-street": {
+                        "question": "Wat is de straat?",
+                        "render": "De straat is <b>{addr:street}</b>"
+                    },
+                    "grb-unit": {
+                        "render": "De wooneenheid-aanduiding is <b>{addr:unit}</b> "
+                    }
+                }
+            }
+        },
         "shortDescription": "Grb Fixup",
         "title": "GRB Fixup"
     },
@@ -999,7 +1039,6 @@
         "description": "Draag bij aan OpenStreetMap door adresinformatie in te vullen",
         "layers": {
             "2": {
-                "description": "Adressen",
                 "tagRenderings": {
                     "uk_addresses_housenumber": {
                         "mappings": {
diff --git a/langs/themes/ru.json b/langs/themes/ru.json
index b6166629c3..fdc231a61f 100644
--- a/langs/themes/ru.json
+++ b/langs/themes/ru.json
@@ -530,12 +530,5 @@
         "description": "Нанесите все деревья на карту!",
         "shortDescription": "Карта деревьев",
         "title": "Деревья"
-    },
-    "uk_addresses": {
-        "layers": {
-            "2": {
-                "description": "Адреса"
-            }
-        }
     }
 }
\ No newline at end of file