diff --git a/assets/layers/toilets/toilets.json b/assets/layers/toilets/toilets.json
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/assets/layers/toilets/toilets.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/assets/layers/toilets/toilets.svg b/assets/layers/toilets/toilets.svg
new file mode 100644
index 0000000..4af924c
--- /dev/null
+++ b/assets/layers/toilets/toilets.svg
@@ -0,0 +1,82 @@
+
+
diff --git a/assets/layers/toilets/urinal.svg b/assets/layers/toilets/urinal.svg
new file mode 100644
index 0000000..29bcfb3
--- /dev/null
+++ b/assets/layers/toilets/urinal.svg
@@ -0,0 +1,88 @@
+
+
\ No newline at end of file
diff --git a/assets/themes/toilets/wheelchair.svg b/assets/layers/toilets/wheelchair.svg
similarity index 100%
rename from assets/themes/toilets/wheelchair.svg
rename to assets/layers/toilets/wheelchair.svg
diff --git a/assets/tagRenderings/icons.json b/assets/tagRenderings/icons.json
new file mode 100644
index 0000000..7a73a41
--- /dev/null
+++ b/assets/tagRenderings/icons.json
@@ -0,0 +1,2 @@
+{
+}
\ No newline at end of file
diff --git a/assets/questions/questions.json b/assets/tagRenderings/questions.json
similarity index 51%
rename from assets/questions/questions.json
rename to assets/tagRenderings/questions.json
index 2595eab..32662cd 100644
--- a/assets/questions/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -2,7 +2,7 @@
"images": {
"render": "{image_carousel()}{image_upload()}"
},
-
+
"osmlink": {
"render": "",
"mappings":[{
@@ -15,6 +15,26 @@
"render": "
",
"condition": "wikipedia~*"
},
+
+ "phone": {
+ "question": {
+ "en": "What is the phone number of {name}?",
+ "de": "Was ist die Telefonnummer von {name}?"
+ },
+ "render": "{phone}",
+ "freeform": {
+ "key": "phone",
+ "type": "phone"
+ }
+ },
+
+ "email": {
+ "render": "{email}",
+ "freeform": {
+ "key": "email",
+ "type": "email"
+ }
+ },
"website": {
"question": {
@@ -28,5 +48,20 @@
"key": "website",
"type": "url"
}
+ },
+
+ "opening_hours": {
+ "question": {
+ "en": "What are the opening hours of {name}?",
+ "de": "Was sind die Öffnungszeiten von {name}?"
+ },
+ "render": {
+ "de": "