diff --git a/assets/layers/toilets/toilets.json b/assets/layers/toilets/toilets.json
new file mode 100644
index 0000000000..7a73a41bfd
--- /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 0000000000..4af924c321
--- /dev/null
+++ b/assets/layers/toilets/toilets.svg
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="64"
+   height="64"
+   viewBox="0 0 64 64"
+   id="svg2"
+   sodipodi:docname="toilets.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1001"
+     id="namedview7"
+     showgrid="false"
+     inkscape:zoom="2.6074563"
+     inkscape:cx="-96.695116"
+     inkscape:cy="91.228234"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer3" />
+  <metadata
+     id="metadata8">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs6" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="background"
+     transform="translate(0,-64)">
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.23933503;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path847"
+       cx="31.580557"
+       cy="96.215309"
+       rx="31.580557"
+       ry="31.513508" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="icon"
+     transform="translate(0,-64)">
+    <rect
+       width="44.118912"
+       height="44.118912"
+       x="9.5211029"
+       y="74.2229"
+       id="canvas"
+       style="visibility:hidden;fill:none;stroke:none;stroke-width:2.75743198" />
+    <path
+       d="m 29.512484,76.980332 v 38.604048 h 4.136148 V 76.980332 Z m -10.34037,2.757432 c -2.284331,0 -4.136148,1.851809 -4.136148,4.136148 0,2.284339 1.851817,4.136148 4.136148,4.136148 2.284331,0 4.136148,-1.851809 4.136148,-4.136148 0,-2.284339 -1.851817,-4.136148 -4.136148,-4.136148 z m 24.816887,0 c -2.28433,0 -4.136148,1.851809 -4.136148,4.136148 0,2.284339 1.851818,4.136148 4.136148,4.136148 2.284331,0 4.136147,-1.851809 4.136147,-4.136148 0,-2.284339 -1.851816,-4.136148 -4.136147,-4.136148 z M 16.414682,90.767492 c -1.653692,0 -2.757432,1.567738 -2.757432,2.757432 0,1.454076 3.44679,4.126883 3.44679,5.514863 0,1.533053 -4.825506,2.757433 -4.825506,8.272293 h 4.825506 v 8.2723 h 4.136148 v -8.2723 h 4.825506 c 0,-5.51486 -4.825506,-6.8122 -4.825506,-8.272293 0,-1.460087 3.44679,-3.994691 3.44679,-5.514863 0,-1.123626 -1.171156,-2.757432 -2.757432,-2.757432 z m 23.438171,0 c -1.454087,0 -2.757431,1.324863 -2.757431,2.757432 0,2.757431 4.825505,11.074036 4.825505,13.787156 v 8.2723 h 4.136147 v -8.2723 c 0,-2.65943 4.825505,-11.029725 4.825505,-13.787156 0,-1.525908 -1.237249,-2.757432 -2.757431,-2.757432 z"
+       id="toilets"
+       style="fill:#734a08;fill-opacity:1;stroke:none;stroke-width:2.75743198"
+       inkscape:connector-curvature="0" />
+  </g>
+</svg>
diff --git a/assets/layers/toilets/urinal.svg b/assets/layers/toilets/urinal.svg
new file mode 100644
index 0000000000..29bcfb3aab
--- /dev/null
+++ b/assets/layers/toilets/urinal.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 100.18594 100.18594"
+   enable-background="new 0 0 100 100"
+   xml:space="preserve"
+   id="svg22"
+   sodipodi:docname="noun_Urinal_1307984.svg"
+   width="100.18594"
+   height="100.18594"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
+     id="metadata28"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs26" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1043"
+     id="namedview24"
+     showgrid="false"
+     inkscape:zoom="3.776"
+     inkscape:cx="-24.614037"
+     inkscape:cy="81.446444"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1" /><g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="bg"
+     transform="translate(0,0.0919838)"><circle
+       style="fill:#55bd00;fill-opacity:1;stroke:none;stroke-width:5.08555174;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.98823529"
+       id="path845"
+       cx="50.092972"
+       cy="50.000988"
+       r="50.092972" /></g><g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="fg"
+     transform="translate(0,0.0919838)"><g
+       id="g849"
+       transform="matrix(1.0774227,0,0,1,-6.5327497,-2.3834746)"><circle
+         cx="45.222931"
+         cy="20.633209"
+         r="6.8829999"
+         id="circle2" /></g><path
+       inkscape:connector-curvature="0"
+       id="path4"
+       d="m 63.360093,62.535796 0.744233,-1.506117 c 0.03247,-0.03923 -1.837395,-1.305776 -1.867394,-1.264947 l -0.594756,1.578256 c 0.02894,-0.04064 1.750018,1.1577 1.717917,1.192808 z"
+       style="stroke-width:1.03798974" /><path
+       inkscape:connector-curvature="0"
+       id="path6"
+       d="m 60.739166,60.844217 0.516546,-1.606098 c 0,0 -0.521003,-0.237131 -1.041486,-0.471307 -0.545369,-0.189171 -1.087902,-0.380873 -1.087902,-0.380873 l -0.357271,1.653154 c 0,0 0.503158,0.179353 1.004367,0.360064 0.483056,0.220467 0.965746,0.44506 0.965746,0.44506 z"
+       style="stroke-width:1.03798974" /><path
+       inkscape:connector-curvature="0"
+       id="path8"
+       d="m 57.763048,59.750399 0.274951,-1.667072 c 0,0 -0.139693,-0.03528 -0.351095,-0.08634 -0.210149,-0.05636 -0.492219,-0.117309 -0.781965,-0.153545 -0.288667,-0.04252 -0.576272,-0.08523 -0.79215,-0.118241 -0.214817,-0.0332 -0.359526,-0.04729 -0.359526,-0.04729 l -0.107285,1.687263 c 0,0 0.53246,0.07874 1.066328,0.159253 0.269259,0.03173 0.532422,0.09093 0.72596,0.146159 0.193384,0.04815 0.324782,0.07981 0.324782,0.07981 z"
+       style="stroke-width:1.03798974" /><path
+       inkscape:connector-curvature="0"
+       id="path10"
+       d="m 52.262826,57.706454 0.162629,1.679272 c -0.01946,-0.04836 2.163417,-0.133706 2.159193,-0.08321 l 0.02616,-1.68819 c 5.23e-4,-0.05289 -2.335967,0.03619 -2.347984,0.09212 z"
+       style="stroke-width:1.03798974" /><path
+       inkscape:connector-curvature="0"
+       id="path12"
+       d="m 44.487525,32.636 v -0.06 -0.546 c 0,-2.926 -2.556724,-5.299 -5.709263,-5.299 -3.152539,0 -5.709263,2.373 -5.709263,5.299 v 0.546 L 35.690687,45.197688 33.068999,85.688 h 11.418526 l -0.0331,-26.43253 c 1.188486,3.790204 7.349685,4.322606 6.763764,-1.56947 z"
+       style="stroke-width:1.03798974"
+       sodipodi:nodetypes="ccsssccccccc" /><path
+       inkscape:connector-curvature="0"
+       id="path14"
+       d="m 68.240384,43.32148 v 15.764528 c -3.446517,5.459344 -5.76619,4.074036 -10.247903,5.133803 1.652985,11.916006 8.426597,10.425906 10.341535,21.124208 v 0.06209 c 2.338689,-0.4811 6.021132,0.919057 6.10748,-2.71532 L 74.347864,43.32148 Z"
+       style="stroke-width:1.49871337"
+       sodipodi:nodetypes="cccccccc" /></g></svg>
\ 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 0000000000..7a73a41bfd
--- /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 2595eab2cb..32662cdd33 100644
--- a/assets/questions/questions.json
+++ b/assets/tagRenderings/questions.json
@@ -2,7 +2,7 @@
   "images": {
     "render": "{image_carousel()}{image_upload()}"
   },
-  
+
   "osmlink": {
     "render": "<a href='https://openstreetmap.org/{id}' target='_blank'><img src='./assets/svg/osm-logo-us.svg'/></a>",
     "mappings":[{
@@ -15,6 +15,26 @@
     "render": "<a href='https://wikipedia.org/wiki/{wikipedia}' target='_blank'><img src='./assets/wikipedia.svg' alt='WP'/></a>",
     "condition":  "wikipedia~*"
   },
+
+  "phone": {
+    "question": {
+      "en": "What is the phone number of {name}?",
+      "de": "Was ist die Telefonnummer von {name}?"
+    },
+    "render": "<a href='tel:{phone}'>{phone}</a>",
+    "freeform": {
+      "key": "phone",
+      "type": "phone"
+    }
+  },
+
+  "email": {
+    "render": "<a href='mailto:{email}' target='_blank'>{email}</a>",
+    "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": "<h3>Öffnungszeiten</h3>{opening_hours_table(opening_hours)}",
+      "en": "<h3>Opening hours</h3>{opening_hours_table(opening_hours)}"
+    },
+    "freeform": {
+      "key": "opening_hours",
+      "type": "opening_hours"
+    }
   }
 }
\ No newline at end of file