diff --git a/langs/layers/cy.json b/langs/layers/cy.json
index 0967ef424..f5b4dc606 100644
--- a/langs/layers/cy.json
+++ b/langs/layers/cy.json
@@ -1 +1,880 @@
-{}
+{
+ "advertising": {
+ "name": "Hysbyseb",
+ "presets": {
+ "13": {
+ "title": "arwydd"
+ }
+ },
+ "title": {
+ "mappings": {
+ "3": {
+ "then": "Colofn"
+ },
+ "4": {
+ "then": "Baner"
+ },
+ "5": {
+ "then": "Sgrin"
+ },
+ "7": {
+ "then": "Arwydd"
+ },
+ "1": {
+ "then": "Bwrdd"
+ }
+ }
+ }
+ },
+ "aerialway": {
+ "pointRendering": {
+ "1": {
+ "label": {
+ "render": "{name}"
+ }
+ }
+ }
+ },
+ "artwork": {
+ "name": "Gwaith Celf",
+ "tagRenderings": {
+ "artwork-artwork_type": {
+ "mappings": {
+ "11": {
+ "then": "Gwaith Teils"
+ },
+ "6": {
+ "then": "Carreg"
+ },
+ "7": {
+ "then": "Gosodiad"
+ },
+ "8": {
+ "then": "Graffiti"
+ }
+ }
+ }
+ }
+ },
+ "assembly_point": {
+ "tagRenderings": {
+ "disaster_type": {
+ "mappings": {
+ "0": {
+ "then": "Daeargryn"
+ },
+ "1": {
+ "then": "Llif"
+ },
+ "2": {
+ "then": "Tân"
+ }
+ }
+ }
+ }
+ },
+ "atm": {
+ "title": {
+ "render": "Peiriant Codi Arian"
+ },
+ "name": "Peiriannau Codi Arian",
+ "tagRenderings": {
+ "operator": {
+ "freeform": {
+ "placeholder": "Gweithredwr"
+ }
+ }
+ }
+ },
+ "bank": {
+ "name": "Banciau"
+ },
+ "barrier": {
+ "title": {
+ "render": "Rhwystr",
+ "mappings": {
+ "0": {
+ "then": "Bolard"
+ }
+ }
+ },
+ "name": "Rhwystrau"
+ },
+ "bbq": {
+ "name": "Barbeciw",
+ "presets": {
+ "0": {
+ "title": "Barbeciw"
+ }
+ },
+ "title": {
+ "render": "Barbeciw"
+ }
+ },
+ "beehive": {
+ "name": "Nythod Gwenyn",
+ "title": "Nyth Gwenyn"
+ },
+ "bench": {
+ "name": "Meinciau",
+ "title": {
+ "render": "Mainc"
+ }
+ },
+ "bench_at_pt": {
+ "title": {
+ "render": "Mainc"
+ },
+ "tagRenderings": {
+ "bench_at_pt-name": {
+ "render": "{name}"
+ }
+ }
+ },
+ "bike_parking": {
+ "tagRenderings": {
+ "Bicycle parking type": {
+ "mappings": {
+ "7": {
+ "then": "Bolard"
+ },
+ "6": {
+ "then": "Sied"
+ }
+ }
+ },
+ "Access": {
+ "render": "{access}"
+ }
+ }
+ },
+ "brothel": {
+ "name": "Puteindai",
+ "title": {
+ "render": "Puteindy"
+ }
+ },
+ "building": {
+ "title": {
+ "render": "Adeilad"
+ },
+ "name": "Adeiladau",
+ "tagRenderings": {
+ "architecture": {
+ "mappings": {
+ "8": {
+ "then": "Rococo"
+ }
+ },
+ "render": "{building:architecture}"
+ }
+ }
+ },
+ "cafe_pub": {
+ "title": {
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ },
+ "1": {
+ "then": "Bar"
+ },
+ "2": {
+ "then": "Caffi"
+ },
+ "3": {
+ "then": "Clwb Nos"
+ }
+ },
+ "render": "Tafarn"
+ }
+ },
+ "campsite": {
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Ffi"
+ }
+ }
+ },
+ "2": {
+ "options": {
+ "0": {
+ "question": "Toiledau"
+ }
+ }
+ },
+ "1": {
+ "options": {
+ "7": {
+ "question": "?"
+ }
+ }
+ }
+ },
+ "title": {
+ "render": "{name}"
+ }
+ },
+ "cinema": {
+ "title": {
+ "render": "Sinema"
+ },
+ "name": "Sinema"
+ },
+ "climbing_area": {
+ "tagRenderings": {
+ "name": {
+ "render": "{name}"
+ },
+ "Rock type (crag/rock/cliff only)": {
+ "mappings": {
+ "0": {
+ "then": "Leim"
+ }
+ }
+ }
+ }
+ },
+ "cycleways_and_roads": {
+ "title": {
+ "render": "Llwybr"
+ }
+ },
+ "defibrillator": {
+ "name": "Diffibrilwyr",
+ "title": {
+ "render": "Diffibriliwr"
+ }
+ },
+ "dentist": {
+ "name": "Deintydd",
+ "pointRendering": {
+ "0": {
+ "label": {
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ }
+ }
+ }
+ }
+ }
+ },
+ "elevator": {
+ "title": {
+ "render": "Lifft"
+ },
+ "name": "Lifft"
+ },
+ "entrance": {
+ "name": "Mynedfa",
+ "title": {
+ "render": "Mynedfa"
+ }
+ },
+ "firepit": {
+ "tagRenderings": {
+ "access": {
+ "mappings": {
+ "0": {
+ "then": "Cyhoeddus"
+ },
+ "2": {
+ "then": "Preifat"
+ }
+ }
+ }
+ }
+ },
+ "food": {
+ "tagRenderings": {
+ "Cuisine": {
+ "mappings": {
+ "5": {
+ "then": "Byrgers"
+ },
+ "0": {
+ "then": "Pizzeria"
+ }
+ }
+ }
+ },
+ "title": {
+ "mappings": {
+ "2": {
+ "then": "Bwyd Brys"
+ }
+ },
+ "render": "Bwyty"
+ }
+ },
+ "ghost_bike": {
+ "tagRenderings": {
+ "ghost_bike-inscription": {
+ "render": "{inscription}"
+ }
+ }
+ },
+ "grave": {
+ "tagRenderings": {
+ "buried:wikidata": {
+ "render": "{wikipedia(buried:wikidata)}"
+ }
+ }
+ },
+ "hospital": {
+ "name": "Ysbytai",
+ "title": {
+ "render": "Ysbyty"
+ }
+ },
+ "icons": {
+ "tagRenderings": {
+ "phonelink": {
+ "render": {
+ "special": {
+ "arialabel": "ffôn"
+ }
+ },
+ "mappings": {
+ "0": {
+ "then": {
+ "special": {
+ "arialabel": "ffôn"
+ }
+ }
+ }
+ }
+ }
+ }
+ },
+ "indoors": {
+ "name": "Dan do"
+ },
+ "lighthouse": {
+ "name": "goleudy",
+ "title": {
+ "render": "goleudy",
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ }
+ }
+ }
+ },
+ "map": {
+ "name": "Mapiau",
+ "title": {
+ "render": "Map"
+ }
+ },
+ "observation_tower": {
+ "title": {
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ }
+ }
+ }
+ },
+ "osm_community_index": {
+ "filter": {
+ "0": {
+ "options": {
+ "0": {
+ "question": "Gwlad"
+ }
+ }
+ },
+ "2": {
+ "options": {
+ "0": {
+ "question": "Rhanbarth"
+ }
+ }
+ },
+ "4": {
+ "options": {
+ "0": {
+ "question": "Tiriogaeth"
+ }
+ }
+ },
+ "5": {
+ "options": {
+ "0": {
+ "question": "Byd"
+ }
+ }
+ }
+ }
+ },
+ "parcel_lockers": {
+ "tagRenderings": {
+ "operator": {
+ "freeform": {
+ "placeholder": "Gweithredwr"
+ }
+ },
+ "ref": {
+ "freeform": {
+ "placeholder": "Cyfeirnod"
+ }
+ },
+ "brand": {
+ "freeform": {
+ "placeholder": "Masnach"
+ }
+ }
+ }
+ },
+ "parking": {
+ "name": "Parcio"
+ },
+ "pharmacy": {
+ "name": "Fferyllfeydd",
+ "title": {
+ "mappings": {
+ "0": {
+ "then": "Fferyllfa"
+ }
+ },
+ "render": "{name}"
+ }
+ },
+ "police": {
+ "tagRenderings": {
+ "police_name": {
+ "render": "{name}"
+ }
+ },
+ "title": {
+ "render": "{name}"
+ }
+ },
+ "postboxes": {
+ "name": "Blychau Post",
+ "title": {
+ "render": "Blwch Post"
+ }
+ },
+ "rainbow_crossings": {
+ "title": {
+ "render": "Croesfan"
+ }
+ },
+ "recycling": {
+ "name": "Ailgylchu"
+ },
+ "scouting_group": {
+ "title": {
+ "render": "{name}"
+ }
+ },
+ "shelter": {
+ "name": "Cysgod",
+ "title": {
+ "render": "Cysgod"
+ }
+ },
+ "shops": {
+ "name": "Siop",
+ "title": {
+ "mappings": {
+ "1": {
+ "then": "{shop}"
+ },
+ "0": {
+ "then": "{name}"
+ }
+ },
+ "render": "Siop"
+ }
+ },
+ "shower": {
+ "name": "Cawod",
+ "title": {
+ "render": "Cawod"
+ }
+ },
+ "sports_centre": {
+ "tagRenderings": {
+ "sport_centre-sport": {
+ "mappings": {
+ "104": {
+ "then": "Pêl-feddal"
+ },
+ "106": {
+ "then": "Sboncen"
+ },
+ "107": {
+ "then": "Sumo"
+ },
+ "108": {
+ "then": "Syrffio"
+ },
+ "109": {
+ "then": "Nofio"
+ },
+ "11": {
+ "then": "Pêl-fas"
+ },
+ "113": {
+ "then": "Tenis"
+ },
+ "14": {
+ "then": "Biathlon"
+ },
+ "16": {
+ "then": "BMX"
+ },
+ "17": {
+ "then": "Bobslê"
+ },
+ "20": {
+ "then": "Bocsio"
+ },
+ "23": {
+ "then": "Canŵ"
+ },
+ "24": {
+ "then": "Gwyddbwyll"
+ },
+ "26": {
+ "then": "Dringo"
+ },
+ "29": {
+ "then": "Criced"
+ },
+ "31": {
+ "then": "Croquet"
+ },
+ "34": {
+ "then": "Seiclo"
+ },
+ "35": {
+ "then": "Dawns"
+ },
+ "36": {
+ "then": "Dartiau"
+ },
+ "4": {
+ "then": "Aikido"
+ },
+ "40": {
+ "then": "Marchogaeth"
+ },
+ "41": {
+ "then": "Ffensio"
+ },
+ "43": {
+ "then": "Ffitrwydd"
+ },
+ "48": {
+ "then": "Futsal"
+ },
+ "52": {
+ "then": "Gymnasteg"
+ },
+ "54": {
+ "then": "Hapkido"
+ },
+ "61": {
+ "then": "Judo"
+ },
+ "62": {
+ "then": "Karate"
+ },
+ "68": {
+ "then": "Lacrosse"
+ },
+ "80": {
+ "then": "Padel"
+ },
+ "83": {
+ "then": "Parkour"
+ },
+ "84": {
+ "then": "Palota"
+ },
+ "85": {
+ "then": "Pesäpallo"
+ },
+ "87": {
+ "then": "Pilates"
+ },
+ "9": {
+ "then": "Bandy"
+ },
+ "92": {
+ "then": "Rhwyfo"
+ },
+ "95": {
+ "then": "Rhedeg"
+ },
+ "98": {
+ "then": "Saethu"
+ },
+ "112": {
+ "then": "Taekwondo"
+ },
+ "126": {
+ "then": "Ioga"
+ },
+ "51": {
+ "then": "Golff"
+ },
+ "103": {
+ "then": "Pêl-droed"
+ },
+ "30": {
+ "then": "CrossFit"
+ },
+ "86": {
+ "then": "Padel"
+ }
+ }
+ }
+ }
+ },
+ "stairs": {
+ "name": "Grisiau",
+ "title": {
+ "render": "Grisiau",
+ "mappings": {
+ "0": {
+ "then": "Esgaladur"
+ }
+ }
+ }
+ },
+ "tertiary_education": {
+ "title": {
+ "mappings": {
+ "2": {
+ "then": "Prifysgol"
+ },
+ "1": {
+ "then": "Coleg"
+ }
+ }
+ }
+ },
+ "toilet": {
+ "name": "Toiledau",
+ "title": {
+ "render": "Toiled"
+ }
+ },
+ "tool_library": {
+ "pointRendering": {
+ "0": {
+ "label": {
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ }
+ }
+ }
+ }
+ }
+ },
+ "tourism_accomodation": {
+ "filter": {
+ "0": {
+ "options": {
+ "1": {
+ "question": "Gwestai"
+ }
+ }
+ }
+ },
+ "tagRenderings": {
+ "name": {
+ "render": "{name}"
+ }
+ }
+ },
+ "trail": {
+ "name": "Llwybrau",
+ "title": {
+ "render": "Llwybr"
+ }
+ },
+ "tree_node": {
+ "tagRenderings": {
+ "tree-decidouous": {
+ "mappings": {
+ "1": {
+ "then": "Bytholwyrdd"
+ }
+ }
+ }
+ },
+ "name": "Coeden",
+ "title": {
+ "render": "Coeden"
+ }
+ },
+ "visitor_information_centre": {
+ "title": {
+ "render": "{name}",
+ "mappings": {
+ "1": {
+ "then": "{name}"
+ }
+ }
+ }
+ },
+ "windturbine": {
+ "title": {
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ }
+ }
+ }
+ },
+ "address": {
+ "description": "Cyfeiriadau"
+ },
+ "animal_shelter": {
+ "title": {
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ }
+ }
+ }
+ },
+ "assisted_repair": {
+ "title": {
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ }
+ }
+ }
+ },
+ "bicycle_rental": {
+ "title": {
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ }
+ }
+ }
+ },
+ "bike_repair_station": {
+ "tagRenderings": {
+ "bike_repair_station-valves": {
+ "mappings": {
+ "1": {
+ "then": "Dunlop"
+ }
+ }
+ }
+ }
+ },
+ "charging_station": {
+ "tagRenderings": {
+ "Available_charging_stations (generated)": {
+ "mappings": {
+ "4": {
+ "then": "Chademo"
+ }
+ }
+ }
+ }
+ },
+ "childcare": {
+ "name": "Gofal Plant"
+ },
+ "climbing_club": {
+ "tagRenderings": {
+ "climbing_club-name": {
+ "render": "{name}"
+ }
+ }
+ },
+ "climbing_opportunity": {
+ "tagRenderings": {
+ "climbing-opportunity-name": {
+ "render": "{name}"
+ }
+ }
+ },
+ "climbing_route": {
+ "tagRenderings": {
+ "Name": {
+ "render": "{name}"
+ }
+ }
+ },
+ "crossings": {
+ "name": "Croesfannau",
+ "title": {
+ "render": "Croesfan"
+ }
+ },
+ "doctors": {
+ "name": "Meddygon"
+ },
+ "extinguisher": {
+ "title": {
+ "render": "Diffoddwyr"
+ }
+ },
+ "governments": {
+ "name": "llywodraethau"
+ },
+ "hackerspace": {
+ "title": {
+ "mappings": {
+ "0": {
+ "then": " {name}"
+ }
+ }
+ }
+ },
+ "ice_cream": {
+ "title": {
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ }
+ }
+ }
+ },
+ "note": {
+ "title": {
+ "render": "Nodyn"
+ }
+ },
+ "railway_platforms": {
+ "title": {
+ "render": "Platfform"
+ }
+ },
+ "summary": {
+ "title": {
+ "render": "Crynodeb"
+ }
+ },
+ "transit_routes": {
+ "title": {
+ "mappings": {
+ "0": {
+ "then": "{name}"
+ }
+ }
+ }
+ },
+ "usersettings": {
+ "title": {
+ "render": "Gosodiadau"
+ }
+ }
+}