diff --git a/assets/layers/elevator/elevator.json b/assets/layers/elevator/elevator.json
index c63252b0e..8db1b6810 100644
--- a/assets/layers/elevator/elevator.json
+++ b/assets/layers/elevator/elevator.json
@@ -17,10 +17,12 @@
     "nl": "Deze laag toont liften en vraagt praktische info over de grootte van de lift en ofdat deze werkt, vooral met het oog op of de lift werkt of niet."
   },
   "title": {
-    "en": "Elevator",
-    "fr": "Ascenseur",
-    "de": "Aufzug",
-    "nl": "Lift"
+    "render": {
+      "en": "Elevator",
+      "fr": "Ascenseur",
+      "de": "Aufzug",
+      "nl": "Lift"
+    }
   },
   "tagRenderings": [
     "images",
@@ -139,7 +141,7 @@
       "icon": {
         "render": "circle:white;./assets/layers/elevator/elevator_wheelchair.svg"
       },
-      "iconSize": "40,40,bottom",
+      "iconSize": "40,40,center",
       "location": [
         "point",
         "centroid"
diff --git a/assets/layers/hackerspace/hackerspace.json b/assets/layers/hackerspace/hackerspace.json
index 921e43f4c..c88e32744 100644
--- a/assets/layers/hackerspace/hackerspace.json
+++ b/assets/layers/hackerspace/hackerspace.json
@@ -50,6 +50,7 @@
     "nl": "Hackerspace"
   },
   "tagRenderings": [
+    "images",
     {
       "id": "is_makerspace",
       "question": {
@@ -374,4 +375,4 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/assets/layers/indoors/indoors.json b/assets/layers/indoors/indoors.json
index 6a21c11d7..9b00ee226 100644
--- a/assets/layers/indoors/indoors.json
+++ b/assets/layers/indoors/indoors.json
@@ -30,27 +30,39 @@
     "mappings": [
       {
         "if": "indoor=room",
-        "then": "Indoor Room {name}"
+        "then": {
+          "en": "Indoor Room {name}"
+        }
       },
       {
         "if": "indoor=area",
-        "then": "Indoor Area {name}"
+        "then": {
+          "en": "Indoor Area {name}"
+        }
       },
       {
         "if": "indoor=wall",
-        "then": "Indoor Wall {name}"
+        "then": {
+          "en": "Indoor Wall {name}"
+        }
       },
       {
         "if": "indoor=corridor",
-        "then": "Indoor Corridor {name}"
+        "then": {
+          "en": "Indoor Corridor {name}"
+        }
       },
       {
         "if": "indoor=door",
-        "then": "Indoor Door {name}"
+        "then": {
+          "en": "Indoor Door {name}"
+        }
       },
       {
         "if": "indoor=level",
-        "then": "Indoor Level {name}"
+        "then": {
+          "en": "Indoor Level {name}"
+        }
       }
     ]
   },
@@ -59,6 +71,29 @@
     "images",
     {
       "id": "ref",
+      "question": {
+        "en": "What is the reference number of this room?"
+      },
+      "render": {
+        "en": "This room has the reference number {ref}"
+      },
+      "freeform": {
+        "key": "ref",
+        "type": "string",
+        "placeholder": {
+          "en": "Reference number of the room (e.g. '1.1' or 'A1')"
+        }
+      },
+      "condition": {
+        "or": [
+          "indoor=room",
+          "indoor=area",
+          "indoor=corridor"
+        ]
+      }
+    },
+    {
+      "id": "name",
       "question": {
         "en": "What is the name of this room?",
         "de": "Wie lautet der Name dieses Raums?"
@@ -68,7 +103,18 @@
         "de": "Der Name des Raums lautet {name}"
       },
       "freeform": {
-        "key": "name"
+        "key": "name",
+        "type": "string",
+        "placeholder": {
+          "en": "Name of the room"
+        }
+      },
+      "condition": {
+        "or": [
+          "indoor=room",
+          "indoor=area",
+          "indoor=corridor"
+        ]
       }
     }
   ],
@@ -93,12 +139,84 @@
     {
       "label": {
         "render": "<div style='margin-top: -20px; color:#013220; background:white' class='rounded-full p-1 font-bold'>{name}</div>",
-        "condition": "name~*"
+        "condition": "name~*",
+        "mappings": [
+          {
+            "if": {
+              "or": [
+                "room=administration",
+                "room=auditorium",
+                "room=bedroom",
+                "room=chapel",
+                "room=class",
+                "room=computer",
+                "room=conference",
+                "room=crypt",
+                "room=kitchen",
+                "room=laboratory",
+                "room=library",
+                "room=locker",
+                "room=nursery",
+                "room=office",
+                "room=prison_cell",
+                "room=restaurant",
+                "room=security_check",
+                "room=sport",
+                "room=storage",
+                "room=technical",
+                "room=toilet",
+                "room=toilets",
+                "room=waiting"
+              ]
+            },
+            "then": "<div style='margin-top: 0px; color:#013220; background:white' class='rounded-full p-1 font-bold'>{name}</div>"
+          }
+        ]
       },
       "location": [
         "point",
         "centroid"
-      ]
+      ],
+      "icon": {
+        "render": null,
+        "condition": "indoor=room",
+        "mappings": [
+          {
+            "if": {
+              "or": [
+                "room=adminstration",
+                "room=auditorium",
+                "room=bedroom",
+                "room=chapel",
+                "room=class",
+                "room=computer",
+                "room=conference",
+                "room=crypt",
+                "room=kitchen",
+                "room=laboratory",
+                "room=library",
+                "room=locker",
+                "room=nursery",
+                "room=office",
+                "room=prison_cell",
+                "room=restaurant",
+                "room=security_check",
+                "room=sport",
+                "room=storage",
+                "room=technical",
+                "room=toilets",
+                "room=waiting"
+              ]
+            },
+            "then": "./assets/layers/indoors/room_{room}.svg"
+          },
+          {
+            "if": "room=toilet",
+            "then": "./assets/layers/indoors/room_toilets.svg"
+          }
+        ]
+      },
+      "iconSize": "15,15, bottom"
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/layers/indoors/license_info.json b/assets/layers/indoors/license_info.json
new file mode 100644
index 000000000..858f28f2e
--- /dev/null
+++ b/assets/layers/indoors/license_info.json
@@ -0,0 +1,222 @@
+[
+  {
+    "path": "room_administration.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_administration.svg"
+    ]
+  },
+  {
+    "path": "room_auditorium.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_auditorium.svg"
+    ]
+  },
+  {
+    "path": "room_bedroom.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_bedroom.svg"
+    ]
+  },
+  {
+    "path": "room_chapel.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_chapel.svg"
+    ]
+  },
+  {
+    "path": "room_class.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_class.svg"
+    ]
+  },
+  {
+    "path": "room_computer.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_computer.svg"
+    ]
+  },
+  {
+    "path": "room_conference.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_conference.svg"
+    ]
+  },
+  {
+    "path": "room_crypt.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_crypt.svg"
+    ]
+  },
+  {
+    "path": "room_kitchen.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_kitchen.svg"
+    ]
+  },
+  {
+    "path": "room_laboratory.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_laboratory.svg"
+    ]
+  },
+  {
+    "path": "room_library.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_library.svg"
+    ]
+  },
+  {
+    "path": "room_locker.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_locker.svg"
+    ]
+  },
+  {
+    "path": "room_nursery.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_nursery.svg"
+    ]
+  },
+  {
+    "path": "room_office.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_office.svg"
+    ]
+  },
+  {
+    "path": "room_prison_cell.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_prison_cell.svg"
+    ]
+  },
+  {
+    "path": "room_restaurant.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_restaurant.svg"
+    ]
+  },
+  {
+    "path": "room_security_check.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_security_check.svg"
+    ]
+  },
+  {
+    "path": "room_sport.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_sport.svg"
+    ]
+  },
+  {
+    "path": "room_storage.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_storage.svg"
+    ]
+  },
+  {
+    "path": "room_technical.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_technical.svg"
+    ]
+  },
+  {
+    "path": "room_toilets.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_toilets.svg"
+    ]
+  },
+  {
+    "path": "room_waiting.svg",
+    "license": "GNU",
+    "authors": [
+      "Adrien Pavie"
+    ],
+    "sources": [
+      "https://framagit.org/OpenLevelUp/OpenLevelUp/-/blob/master/src/img/features-vector/room_waiting.svg"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/assets/layers/indoors/room_administration.svg b/assets/layers/indoors/room_administration.svg
new file mode 100644
index 000000000..3bc7f7bba
--- /dev/null
+++ b/assets/layers/indoors/room_administration.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100px"
+   height="86.112px"
+   viewBox="0 0 100 86.112"
+   enable-background="new 0 0 100 86.112"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_administration.svg"><metadata
+     id="metadata13"><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="defs11" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="876"
+     id="namedview9"
+     showgrid="false"
+     inkscape:zoom="2.7406169"
+     inkscape:cx="50"
+     inkscape:cy="43.056"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 94.444,44.446 -88.888,0 -5.556,0 0,6.943 5.556,0 0,34.723 88.888,0 0,-34.723 5.556,0 0,-6.943 z"
+     id="path3"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccccccccc" /><circle
+     cx="50"
+     cy="8.333"
+     r="8.333"
+     id="circle5" /><path
+     d="M61.11,19.445H38.889c-6.945,0-9.723,5.555-9.723,9.722v9.723v2.777h6.944V38.89v-8.333h2.778v8.333v2.777H61.11V38.89  v-8.333h2.779v8.333v2.777h6.943V38.89v-9.723C70.833,25,68.056,19.445,61.11,19.445z"
+     id="path7" /></svg>
\ No newline at end of file
diff --git a/assets/layers/indoors/room_auditorium.svg b/assets/layers/indoors/room_auditorium.svg
new file mode 100644
index 000000000..7c0853943
--- /dev/null
+++ b/assets/layers/indoors/room_auditorium.svg
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="32"
+   height="32"
+   id="svg4173"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32"
+   sodipodi:docname="room_auditorium.svg">
+  <defs
+     id="defs4175" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="14.086898"
+     inkscape:cy="17.815466"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4178">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4754">
+      <g
+         transform="matrix(0.99613747,0,0,0.99720502,4.5444389,-15.955572)"
+         id="g4748">
+        <path
+           style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.09307814;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 9.5,21 c 2.628314,0.02116 1.84479,0.03572 4,0 2.320666,-0.03846 8.6,-2.2 8.6,-2.2 l 0.9,2.7 -8,2.5 0,8 -7,0 0,-8 -8,-2.5 c -0.00241285,-0.511499 0.9024134,-2.188502 0.9,-2.7 0,0 5.9716863,2.17884 8.6,2.2 z"
+           id="rect4831"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="zsccccccccz" />
+        <circle
+           style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.17889357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           id="path4834"
+           cx="11.5"
+           cy="18.5"
+           r="2.5" />
+      </g>
+      <rect
+         y="11.401361"
+         x="10.401361"
+         height="13.197278"
+         width="11.197278"
+         id="rect4752"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.8027218;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760"
+       cx="3"
+       cy="29"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-5"
+       cx="9.5"
+       cy="29"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-9"
+       cx="16"
+       cy="29"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-5-6"
+       cx="22.5"
+       cy="29"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-5-6-4"
+       cx="29"
+       cy="29"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-3"
+       cx="6.2500005"
+       cy="24.9"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-5-2"
+       cx="12.749995"
+       cy="24.9"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-9-5"
+       cx="19.249994"
+       cy="24.9"
+       r="2.6152306" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0.76953912;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-5-6-40"
+       cx="25.749994"
+       cy="24.9"
+       r="2.6152306" />
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_bedroom.svg b/assets/layers/indoors/room_bedroom.svg
new file mode 100644
index 000000000..183cd8666
--- /dev/null
+++ b/assets/layers/indoors/room_bedroom.svg
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_bedroom.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="1056"
+     inkscape:window-width="1920"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.92167712"
+     inkscape:cx="116.58479"
+     inkscape:cy="281.19503"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective2441" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_z="60 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       viewBox="244.5 110 489 219.9"
+       id="symbol-university">
+      <path
+         id="path4460"
+         d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" />
+      <path
+         id="path4462"
+         d="M94,176l-21,39"
+         stroke-width="20"
+         stroke="#000000"
+         fill="none" />
+      <path
+         id="path4464"
+         d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" />
+      <path
+         id="path4466"
+         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
+         stroke-width="20"
+         stroke="#000000"
+         ill="none" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_z="12 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4904"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 16 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect4134"
+       width="10"
+       height="10"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect4136"
+       width="8"
+       height="8"
+       x="2"
+       y="2" />
+  </g>
+  <path
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:35.82899857;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="m 533.79503,192.59912 3.199,249.52176"
+     id="path2157"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:35.82876587;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 530.59603,349.34997 50.746487,352.54896"
+     id="path2159"
+     inkscape:connector-curvature="0" />
+  <path
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:35.82899857;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 47.547487,432.52389 44.348497,269.37504"
+     id="path2161"
+     inkscape:connector-curvature="0" />
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:41.20307922;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect2163"
+     width="252.72075"
+     height="44.785957"
+     x="-348.24902"
+     y="258.17859"
+     ry="22.392979"
+     transform="scale(-1,1)" />
+  <ellipse
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:52.97649384;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path2167"
+     transform="scale(-1,1)"
+     cx="-419.43088"
+     cy="198.47372"
+     rx="34.900505"
+     ry="30.90176" />
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:35.82876587;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="rect2169"
+     width="97.569405"
+     height="7.9974923"
+     x="-490.60858"
+     y="293.36755"
+     ry="3.9987462"
+     transform="scale(-1,1)" />
+</svg>
diff --git a/assets/layers/indoors/room_chapel.svg b/assets/layers/indoors/room_chapel.svg
new file mode 100644
index 000000000..1dc57c010
--- /dev/null
+++ b/assets/layers/indoors/room_chapel.svg
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_chapel.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="843"
+     inkscape:window-width="1600"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.64"
+     inkscape:cx="320.89986"
+     inkscape:cy="306.94069"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective2441" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_z="60 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       viewBox="244.5 110 489 219.9"
+       id="symbol-university">
+      <path
+         id="path4460"
+         d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" />
+      <path
+         id="path4462"
+         d="M94,176l-21,39"
+         stroke-width="20"
+         stroke="#000000"
+         fill="none" />
+      <path
+         id="path4464"
+         d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" />
+      <path
+         id="path4466"
+         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
+         stroke-width="20"
+         stroke="#000000"
+         ill="none" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_z="12 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective2893"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3898"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4011"
+       inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+       inkscape:vp_z="1 : 0.5 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 0.5 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <circle
+     style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:78.40299988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     id="path4158"
+     cx="282.8125"
+     cy="98.75"
+     r="57.8125" />
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect4134"
+       width="10"
+       height="10"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect4136"
+       width="8"
+       height="8"
+       x="2"
+       y="2" />
+  </g>
+  <path
+     style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:128.99134827;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="m 336.04092,228.20338 32.60294,127.78375"
+     id="path4817"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:56.67275238;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+     d="M 327.15153,205.27243 201.86022,223.14418 128.4406,135.72436"
+     id="path5329"
+     sodipodi:nodetypes="ccc" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:71.79707336;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+     d="m 419.18715,496.11435 -173.27583,1.87442"
+     id="path5331"
+     sodipodi:nodetypes="cc" />
+  <path
+     style="fill:none;stroke:#000000;stroke-width:78.40309906;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+     d="m 395.95938,373.03073 -149.108,110.5251"
+     id="path5333"
+     sodipodi:nodetypes="cc" />
+  <path
+     sodipodi:nodetypes="cc"
+     id="path4057"
+     d="M 381.59627,361.98219 246.85138,483.55583"
+     style="fill:none;stroke:#000000;stroke-width:78.40309906;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
+  <path
+     sodipodi:nodetypes="ccc"
+     id="path4059"
+     d="M 327.15153,215.27243 201.86022,223.14418 128.4406,135.72436"
+     style="fill:none;stroke:#000000;stroke-width:56.67275238;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1" />
+</svg>
diff --git a/assets/layers/indoors/room_class.svg b/assets/layers/indoors/room_class.svg
new file mode 100644
index 000000000..ea194e66d
--- /dev/null
+++ b/assets/layers/indoors/room_class.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="32"
+   height="32"
+   id="svg4191"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32"
+   sodipodi:docname="room_class.svg">
+  <defs
+     id="defs4193" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="14.893437"
+     inkscape:cx="7.9039314"
+     inkscape:cy="14.443919"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4196">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49600005;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4827"
+       width="25"
+       height="16"
+       x="7"
+       y="2.3841858e-07" />
+    <path
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.08668458;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 2.7139971,10.107145 6.7910722,0 8.3975627,-2.4022019 0.873412,2.6073819 -9.2709747,2.838856 0,7.849781 -8.96172698,0 0,-8.723274 c 0.01427,-1.054337 0.65575038,-2.127446 2.17065478,-2.170543 z"
+       id="rect4831"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <circle
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1.17889357;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4834"
+       cx="5.9697213"
+       cy="7.0754628"
+       r="2.9105532" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49613738;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 2.277832,26.624833 C 1.0325716,26.624833 0,27.657405 0,28.902667 L 0,32 10,32 10,28.902667 C 10,27.657405 8.9674284,26.624833 7.722168,26.624833 Z"
+       id="rect4758"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssccsss" />
+    <ellipse
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760"
+       cx="5.0001459"
+       cy="23.899757"
+       rx="2.3388894"
+       ry="2.3389902" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49613738;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 13.247832,26.624833 c -1.245261,0 -2.277832,1.032572 -2.277832,2.277834 l 0,3.097333 10,0 0,-3.097333 c 0,-1.245262 -1.032572,-2.277834 -2.277832,-2.277834 z"
+       id="rect4758-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssccsss" />
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.49613738;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="M 24.277832,26.624833 C 23.032571,26.624833 22,27.657405 22,28.902667 L 22,32 l 10,0 0,-3.097333 c 0,-1.245262 -1.032572,-2.277834 -2.277832,-2.277834 z"
+       id="rect4758-4-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ssccsss" />
+    <ellipse
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-6"
+       cx="15.860535"
+       cy="23.9"
+       rx="2.3388894"
+       ry="2.3389902" />
+    <ellipse
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4760-6-5"
+       cx="26.973131"
+       cy="23.9"
+       rx="2.3388894"
+       ry="2.3389902" />
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_computer.svg b/assets/layers/indoors/room_computer.svg
new file mode 100644
index 000000000..c5637733f
--- /dev/null
+++ b/assets/layers/indoors/room_computer.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+
+<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.0"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32"
+   enable-background="new 0 0 90.321 100"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_computer.svg"><metadata
+     id="metadata9"><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="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="18.88"
+     inkscape:cx="11.485072"
+     inkscape:cy="16.136916"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><path
+     d="m 27.673508,31 0,-2.430511 -7.673508,0 0,-4.593925 11.409145,0 C 31.735369,23.975564 32,23.706668 32,23.375496 L 32,1.6007883 C 32,1.2688968 31.735369,1 31.409145,1 L 0.59085517,1 C 0.2646315,1 0,1.2688968 0,1.6007883 L 0,23.375496 c 0,0.331172 0.2646315,0.600068 0.59085517,0.600068 l 11.40914483,0 0,4.593925 -7.5596338,0 0,2.430511 z m -25.51062,-9.895011 0,-17.5280016 c 0,-0.2861755 0.2277478,-0.5183554 0.5074193,-0.5183554 l 26.5444377,0 c 0.279671,0 0.507419,0.2325399 0.507419,0.5183554 l 0,17.5280016 c 0,0.286536 -0.227748,0.517636 -0.507419,0.517636 l -26.5444377,0 c -0.2796715,3.6e-4 -0.5074193,-0.2311 -0.5074193,-0.517636 z"
+     id="path3"
+     style="clip-rule:evenodd;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccsssssssscccccssssssscs" /><path
+     d="m 2.162888,21.104989 0,-17.5280011 c 0,-0.2861755 0.227748,-0.5183554 0.507419,-0.5183554 l 26.544438,0 c 0.279671,0 0.507419,0.2325399 0.507419,0.5183554 l 0,17.5280011 c 0,0.286536 -0.227748,0.517636 -0.507419,0.517636 l -26.544438,0 c -0.279671,3.6e-4 -0.507419,-0.2311 -0.507419,-0.517636 z"
+     id="path3-7"
+     style="clip-rule:evenodd;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-opacity:1"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ssssssscs" /></svg>
\ No newline at end of file
diff --git a/assets/layers/indoors/room_conference.svg b/assets/layers/indoors/room_conference.svg
new file mode 100644
index 000000000..5ee49fb50
--- /dev/null
+++ b/assets/layers/indoors/room_conference.svg
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:ns="&amp;#38;ns_ai;"
+   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:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="32"
+   height="32"
+   viewBox="0 0 32.000002 31.999999"
+   id="svg4200"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_conference.svg">
+  <defs
+     id="defs4202" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="14.135566"
+     inkscape:cy="17.138285"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     units="px"
+     inkscape:window-width="1440"
+     inkscape:window-height="878"
+     inkscape:window-x="1672"
+     inkscape:window-y="142"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4205">
+    <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>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(146.08571,-604.92657)">
+    <switch
+       transform="matrix(0.08342024,0,0,0.08342024,-146.7781,604.21864)"
+       id="switch3">
+      <foreignObject
+         requiredExtensions="http://ns.adobe.com/AdobeIllustrator/10.0/"
+         x="0"
+         y="0"
+         width="1"
+         height="1">
+        <ns:pgfRef
+           xlink:href="#adobe_illustrator_pgf" />
+      </foreignObject>
+      <g
+         ns:extraneous="self"
+         id="g5">
+        <g
+           id="g7">
+          <path
+             inkscape:connector-curvature="0"
+             d="m 8.3,193.8 c 0,-47 8.2,-70.5 24.7,-70.5 0.8,0 3.7,1.4 8.7,4.2 5,2.8 11.5,5.6 19.5,8.5 8,2.9 15.9,4.3 23.8,4.3 8.9,0 17.8,-1.5 26.6,-4.6 -0.7,4.9 -1,9.3 -1,13.2 0,18.5 5.4,35.5 16.2,51.1 -21.5,0.7 -39.2,9.2 -52.9,25.6 l -26.8,0 C 36.2,225.6 27,222.9 19.6,217.5 12.1,212.1 8.3,204.2 8.3,193.8 Z m 40.6,-85.4 c -10,-10 -15,-22 -15,-36.1 0,-14.1 5,-26.2 15,-36.1 10,-10 22,-15 36.1,-15 14.1,0 26.1,5 36.1,15 10,10 15,22 15,36.1 0,14.1 -5,26.1 -15,36.1 -10,10 -22,15 -36.1,15 -14.1,-0.1 -26.2,-5 -36.1,-15 z m 10.5,218.8 c 0,-7 0.2,-13.9 0.7,-20.7 0.5,-6.7 1.4,-14 2.8,-21.8 1.4,-7.8 3.2,-15 5.3,-21.7 2.1,-6.7 5,-13.1 8.6,-19.5 3.6,-6.3 7.7,-11.7 12.4,-16.2 4.7,-4.5 10.3,-8 17.1,-10.7 6.7,-2.7 14.1,-4 22.3,-4 1.3,0 4.2,1.4 8.6,4.3 4.4,2.9 9.3,6.1 14.6,9.6 5.3,3.5 12.4,6.7 21.4,9.6 8.9,2.9 17.9,4.3 26.9,4.3 9.1,0 18,-1.4 27,-4.3 8.9,-2.9 16,-6.1 21.4,-9.6 5.3,-3.5 10.2,-6.7 14.6,-9.6 4.4,-2.9 7.3,-4.3 8.6,-4.3 8.1,0 15.5,1.3 22.2,4 6.7,2.7 12.4,6.2 17.1,10.7 4.7,4.5 8.8,9.9 12.4,16.2 3.6,6.3 6.4,12.8 8.6,19.5 2.1,6.7 3.9,13.9 5.3,21.7 1.4,7.8 2.3,15 2.8,21.8 0.5,6.7 0.7,13.6 0.7,20.7 0,16 -4.9,28.6 -14.6,37.8 -9.7,9.2 -22.6,13.9 -38.7,13.9 l -174.8,0 C 96.6,378.9 83.7,374.3 74,365 64.3,355.8 59.4,343.1 59.4,327.2 Z m 86.4,-124.1 c -15,-15 -22.5,-33 -22.5,-54.2 0,-21.2 7.5,-39.2 22.5,-54.2 15,-15 33,-22.5 54.2,-22.5 21.2,0 39.2,7.5 54.2,22.5 15,15 22.5,33 22.5,54.2 0,21.2 -7.5,39.2 -22.5,54.2 -15,15 -33,22.5 -54.2,22.5 -21.2,0 -39.2,-7.5 -54.2,-22.5 z m 133.1,-94.7 c -10,-10 -15,-22 -15,-36.1 0,-14.1 5,-26.2 15,-36.1 10,-10 22,-15 36.1,-15 14.1,0 26.1,5 36.1,15 10,10 15,22 15,36.1 0,14.1 -5,26.1 -15,36.1 -10,10 -22,15 -36.1,15 -14.1,-0.1 -26.2,-5 -36.1,-15 z m -5.6,91.6 c 10.8,-15.6 16.2,-32.6 16.2,-51.1 0,-3.9 -0.3,-8.2 -1,-13.2 8.8,3.1 17.6,4.6 26.6,4.6 7.8,0 15.8,-1.4 23.8,-4.3 8,-2.9 14.5,-5.7 19.5,-8.5 5,-2.8 7.9,-4.2 8.7,-4.2 16.5,0 24.8,23.5 24.8,70.5 0,10.4 -3.7,18.3 -11.2,23.7 -7.5,5.4 -16.7,8.1 -27.6,8.1 l -26.7,0 C 312.5,209.2 294.8,200.7 273.3,200 Z"
+             id="path9" />
+        </g>
+        <g
+           id="g11" />
+        <g
+           id="g13" />
+        <g
+           id="g15" />
+        <g
+           id="g17" />
+        <g
+           id="g19" />
+        <g
+           id="g21" />
+        <g
+           id="g23" />
+        <g
+           id="g25" />
+        <g
+           id="g27" />
+        <g
+           id="g29" />
+        <g
+           id="g31" />
+        <g
+           id="g33" />
+        <g
+           id="g35" />
+        <g
+           id="g37" />
+        <g
+           id="g39" />
+      </g>
+    </switch>
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_crypt.svg b/assets/layers/indoors/room_crypt.svg
new file mode 100644
index 000000000..eae7a7ed1
--- /dev/null
+++ b/assets/layers/indoors/room_crypt.svg
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="32"
+   height="32"
+   id="svg2432"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_crypt.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   version="1.0">
+  <defs
+     id="defs2434">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       id="perspective2440" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="15.469646"
+     inkscape:cy="17.151405"
+     inkscape:document-units="px"
+     inkscape:current-layer="g2419"
+     showgrid="false"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="1920"
+     inkscape:window-y="568"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata2437">
+    <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>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-10.123271,-1014.5764)">
+    <g
+       id="g2419">
+      <g
+         id="g4194"
+         transform="matrix(0.95476578,0,0,0.95476578,0.40911617,43.341061)">
+        <circle
+           r="2.0424771"
+           cy="1031.203"
+           cx="27.112326"
+           id="path4158"
+           style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:78.40299988;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path4817"
+           d="m 28.992851,1035.7765 1.15184,4.5145"
+           style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:4.55717897;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="ccc"
+           id="path5329"
+           d="m 28.678794,1034.9664 -4.426458,0.6313 -2.593867,-3.0885"
+           style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.00221062;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path5331"
+           d="m 31.930352,1045.2416 -6.12172,0.066"
+           style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.53654289;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           sodipodi:nodetypes="cc"
+           id="path5333"
+           d="m 31.10973,1040.8932 -5.267886,3.9047"
+           style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.76992941;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.76992941;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 30.602291,1040.5028 -4.760447,4.2951"
+           id="path4057"
+           sodipodi:nodetypes="cc"
+           inkscape:connector-curvature="0" />
+        <path
+           style="fill:none;fill-opacity:1;stroke:#000000;stroke-width:2.00221062;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           d="m 28.678794,1035.3196 -4.426458,0.2781 -2.593867,-3.0885"
+           id="path4059"
+           sodipodi:nodetypes="ccc"
+           inkscape:connector-curvature="0" />
+      </g>
+      <path
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+         d="m 10.123271,1018.5764 c 32,0 0,0 32,0 -2.81845,7.889 -4,14.3533 -4,24 -4,0 0,0 -4,0 0,-9.9686 1.067647,-21 -8,-21 -9.067647,0 -8,11.3906 -8,21 -4,0 0,0 -4,0 0,-9.486 -1.204022,-16.174 -4,-24 z"
+         id="path4192"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="cccccccc" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_kitchen.svg b/assets/layers/indoors/room_kitchen.svg
new file mode 100644
index 000000000..fc666fc94
--- /dev/null
+++ b/assets/layers/indoors/room_kitchen.svg
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="32"
+   height="32"
+   id="svg4165"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   viewBox="0 0 32 32"
+   sodipodi:docname="room_kitchen.svg">
+  <defs
+     id="defs4167" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.836083"
+     inkscape:cx="11.22005"
+     inkscape:cy="15.818895"
+     inkscape:current-layer="g4779"
+     showgrid="true"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4170">
+    <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>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <g
+       id="g4779"
+       transform="translate(0,-3.5)"
+       style="fill:#ffffff;fill-opacity:1">
+      <rect
+         ry="2.1156538"
+         y="7.9568424"
+         x="0.95684242"
+         height="23.086315"
+         width="30.086315"
+         id="rect4713"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.91368484;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4734"
+         d="m 1,14.75 30,0"
+         style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.5001303;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1" />
+      <rect
+         ry="1.0734978"
+         y="17.5"
+         x="4"
+         height="10.5"
+         width="24"
+         id="rect4736"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         r="1"
+         cy="11.5"
+         cx="5"
+         id="path4738"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         r="1"
+         cy="11.5"
+         cx="18"
+         id="path4738-2"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         r="1"
+         cy="11.5"
+         cx="21"
+         id="path4738-0"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         r="1"
+         cy="11.5"
+         cx="24"
+         id="path4738-2-6"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <circle
+         r="1"
+         cy="11.5"
+         cx="27"
+         id="path4738-0-1"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.5;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_laboratory.svg b/assets/layers/indoors/room_laboratory.svg
new file mode 100644
index 000000000..04c740fe7
--- /dev/null
+++ b/assets/layers/indoors/room_laboratory.svg
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<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"
+   id="Layer_1"
+   x="0px"
+   y="0px"
+   width="100"
+   height="100"
+   viewBox="0 0 100 100"
+   enable-background="new 0 0 51.856 100"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_laboratory.svg"><metadata
+     id="metadata21"><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 /></cc:Work></rdf:RDF></metadata><defs
+     id="defs19" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     id="namedview17"
+     showgrid="false"
+     inkscape:zoom="9.44"
+     inkscape:cx="48.520331"
+     inkscape:cy="31.445646"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Layer_1" /><ellipse
+     cx="57.499287"
+     cy="2.5"
+     id="circle3"
+     rx="2.5069063"
+     ry="2.5" /><ellipse
+     cx="58.502052"
+     cy="11.499001"
+     id="circle5"
+     rx="2.5069063"
+     ry="2.5" /><ellipse
+     cx="43.96199"
+     cy="19.998999"
+     id="circle7"
+     rx="3.0082874"
+     ry="3" /><ellipse
+     cx="48.975803"
+     cy="7.9990005"
+     id="circle9"
+     rx="3.0082874"
+     ry="3" /><ellipse
+     cx="53.488235"
+     cy="20.498999"
+     id="circle11"
+     rx="4.5124311"
+     ry="4.5" /><path
+     d="m 74.882173,89.16 -14.855926,-34.568 0,-22.118 1.232395,-2.475 -4.475329,0 -0.768116,1.532 0,23.881 15.252018,35.482 c 0.787168,1.569 0.945605,3.008 0.426174,3.848 C 71.190002,95.553 69.895436,96 68.047344,96 l -18.046716,0 -0.001,0 -18.047719,0 c -1.847089,0 -3.141655,-0.447 -3.645042,-1.258 -0.520434,-0.84 -0.360995,-2.278 0.426174,-3.848 l 15.252017,-35.482 0,-23.881 -0.767113,-1.532 -4.475329,0 1.232395,2.475 0,22.118 -14.857932,34.568 c -1.406875,2.842 -1.489102,5.64 -0.222613,7.685 0.892459,1.439 2.840826,3.155 7.057443,3.155 l 18.047719,0 0.001,0 18.046716,0 c 4.216617,0 6.164984,-1.716 7.057443,-3.155 1.267492,-2.045 1.185265,-4.843 -0.222614,-7.685 z"
+     id="path15"
+     inkscape:connector-curvature="0" /><path
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="M 32,92 68,92 52,56 48,56 Z"
+     id="path4139"
+     inkscape:connector-curvature="0"
+     sodipodi:nodetypes="ccccc" /></svg>
\ No newline at end of file
diff --git a/assets/layers/indoors/room_library.svg b/assets/layers/indoors/room_library.svg
new file mode 100644
index 000000000..31ae21fff
--- /dev/null
+++ b/assets/layers/indoors/room_library.svg
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_library.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="843"
+     inkscape:window-width="1600"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.65172414"
+     inkscape:cx="-251.28159"
+     inkscape:cy="282.72741"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective2441" />
+    <inkscape:perspective
+       id="perspective2466"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3333"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3401"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective3464"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <path
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 73.931354,159.8883 L 302.43289,419.37306 L 521.25215,293.50359 L 298.56009,35.95529 L 73.931354,159.8883 z"
+     id="path3470" />
+  <path
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 61.6534,188.60064 L 286.28195,444.21251 L 287.2502,541.03514 L 60.685154,284.9392 L 61.6534,188.60064 z"
+     id="path3474" />
+  <path
+     style="opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:16.47733498;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 519.50933,327.13704 L 313.25992,447.99014 L 313.11567,451.17546 L 519.19198,330.40891 L 519.50933,327.13704 z"
+     id="path3476"
+     sodipodi:nodetypes="ccccc" />
+  <path
+     sodipodi:nodetypes="ccccc"
+     id="path3505"
+     d="M 519.50933,367.13704 L 313.25992,487.99014 L 313.11567,491.17546 L 519.19198,370.40891 L 519.50933,367.13704 z"
+     style="opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:16.47733498;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+  <path
+     style="opacity:0.75;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:16.47733498;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+     d="M 519.50933,407.13704 L 313.25992,527.99014 L 313.11567,531.17546 L 519.19198,410.40891 L 519.50933,407.13704 z"
+     id="path3507"
+     sodipodi:nodetypes="ccccc" />
+</svg>
diff --git a/assets/layers/indoors/room_locker.svg b/assets/layers/indoors/room_locker.svg
new file mode 100644
index 000000000..6826a50c0
--- /dev/null
+++ b/assets/layers/indoors/room_locker.svg
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32.000001"
+   id="svg4243"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_locker.svg">
+  <defs
+     id="defs4245" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="16.859321"
+     inkscape:cy="16.049313"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="1920"
+     inkscape:window-y="568"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata4248">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <g
+       id="g4138"
+       transform="matrix(0.98552872,0,0,0.98552872,0.23128765,15.124038)">
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path4791"
+         d="m 1.9107582,1044.357 28.3650268,0 c 1.503499,0 1.741399,-2.0261 -0.06625,-3.031 -14.132822,-6.5671 0,0 -14.132822,-6.5671 -14.1659498,6.5671 0,0 -14.1659498,6.5671 -2.31630461,1.2877 -1.3471689,3.031 0,3.031 z"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.50000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="cac"
+         inkscape:connector-curvature="0"
+         id="path4793"
+         d="m 16.076708,1034.7589 c 5.382993,-2.274 4.931838,-5.839 2.927974,-7.7302 -1.915266,-1.8076 -7.214327,-1.6047 -7.214327,3.2209"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.50000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_nursery.svg b/assets/layers/indoors/room_nursery.svg
new file mode 100644
index 000000000..549839df0
--- /dev/null
+++ b/assets/layers/indoors/room_nursery.svg
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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.0"
+   width="32"
+   height="32"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_nursery.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="843"
+     inkscape:window-width="1600"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="14.746834"
+     inkscape:cx="8.7831543"
+     inkscape:cy="18.759312"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:current-layer="g4152"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective2441" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_z="60 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       viewBox="244.5 110 489 219.9"
+       id="symbol-university">
+      <path
+         id="path4460"
+         d="m 79,43 57,119 c 0,0 21,-96 104,-96 83,0 124,106 124,106 L 407,39 489,22 0,17 79,43 Z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4462"
+         d="M 94,176 73,215"
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#000000;stroke-width:20" />
+      <path
+         id="path4464"
+         d="M 300,19 C 300,29.5 277.4,38 249.5,38 221.6,38 199,29.5 199,19 199,8.5 221.6,0 249.5,0 277.4,0 300,8.5 300,19 Z"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path4466"
+         d="M 112,216 96,178 64,88 C 64,88 55,80 60,53 65,26 76,29 76,29"
+         ill="none"
+         inkscape:connector-curvature="0"
+         style="stroke:#000000;stroke-width:20" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_z="12 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,-581.30675)">
+    <rect
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4134"
+       width="10"
+       height="10"
+       x="1"
+       y="1" />
+    <rect
+       style="display:inline;fill:none;stroke:#757575;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4136"
+       width="8"
+       height="8"
+       x="2"
+       y="2" />
+  </g>
+  <g
+     id="g4152"
+     transform="matrix(2.4175393,0,0,2.4175393,-23.092452,-1.9485833)">
+    <path
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scsssssss"
+       id="flowRoot3192"
+       d="m 16.130405,14.042619 c 1.411941,4.8e-5 2.609667,-0.496847 3.593192,-1.490695 0.983467,-0.993746 1.475212,-2.174358 1.475246,-3.5418285 -3.4e-5,-1.4299504 -0.491779,-2.6418589 -1.475246,-3.6357153 -0.983525,-0.9937335 -2.181251,-1.4906346 -3.593192,-1.490693 -1.351973,5.84e-5 -2.519704,0.4969595 -3.503183,1.490693 -0.983515,0.9938564 -1.475264,2.2057649 -1.47525,3.6357153 -1.4e-5,1.3674705 0.491735,2.5480825 1.47525,3.5418285 0.983479,0.993848 2.15121,1.490743 3.503183,1.490695 z"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    <path
+       sodipodi:nodetypes="ccccc"
+       inkscape:connector-curvature="0"
+       id="rect4145"
+       d="m 11.288725,1.7083287 c 3.445408,-0.87546796 6.398903,-0.85538925 9.765285,0 -0.348424,2.2537688 -0.357212,2.2189444 -0.7201,4.3823759 -2.27368,-0.5777377 -5.779259,-0.6468892 -8.325082,0 C 11.701724,4.0885157 11.62889,3.7847234 11.288725,1.7083287 Z"
+       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.50906837;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+    <g
+       transform="matrix(1.2507008,0,0,1.2630355,-4.0381717,-1.6161194)"
+       style="font-style:normal;font-weight:normal;font-size:8.93828297px;line-height:125%;font-family:Sans;letter-spacing:0px;word-spacing:0px;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.66389823;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="text4148">
+      <path
+         d="m 16.295116,2.9265522 0,0.8839885 0.883988,0 0,0.269799 -0.883988,0 0,0.8839886 -0.266625,0 0,-0.8839886 -0.883989,0 0,-0.269799 0.883989,0 0,-0.8839885 0.266625,0 z"
+         style="font-size:3.25028467px;fill:none;stroke:#000000;stroke-width:0.66389823;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4159"
+         inkscape:connector-curvature="0" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_office.svg b/assets/layers/indoors/room_office.svg
new file mode 100644
index 000000000..4e49e97f4
--- /dev/null
+++ b/assets/layers/indoors/room_office.svg
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="32"
+   height="32"
+   viewBox="0 0 31.999999 31.999998"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_office.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="11.962509"
+     inkscape:cy="16.484784"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:window-maximized="1"
+     units="px" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4155"
+       width="7.5383725"
+       height="13.476279"
+       x="20.953938"
+       y="1037.3859" />
+    <rect
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999988;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect4157"
+       width="15.076745"
+       height="2.6952569"
+       x="14.923253"
+       y="1034.6908" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.53875327;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 3.0772436,1050.5928 8.6152744,0"
+       id="path4159"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.07750666px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 7.3848842,1050.3239 0,-7.0077"
+       id="path4161"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.20468032px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 12.769441,1042.713 -10.1671008,0 0,-11.9833"
+       id="path4163"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.69376612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 14.923256,1049.2451 0,-8.797 -9.7516375,0"
+       id="path4165"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.8790226;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 5.7695185,1039.8387 -1e-7,-10.5378"
+       id="path4167"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.53875327;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 16.775595,1034.0982 5.71119,0 2.969606,-5.1495"
+       id="path4169"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.15501308;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 5.8515199,1028.4405 9.8585831,4.561"
+       id="path4171"
+       inkscape:connector-curvature="0" />
+    <ellipse
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4173"
+       cx="5.8233638"
+       cy="1024.5038"
+       rx="2.6384292"
+       ry="2.6413507" />
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_prison_cell.svg b/assets/layers/indoors/room_prison_cell.svg
new file mode 100644
index 000000000..3fd3d2116
--- /dev/null
+++ b/assets/layers/indoors/room_prison_cell.svg
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32.000001"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_prison_cell.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="14.101864"
+     inkscape:cy="19.144352"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:40px;line-height:125%;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 16.035155,1023.7252 c -1.036642,0 -1.930283,0.3655 -2.683594,1.0957 -0.75341,0.7304 -1.130906,1.638 -1.130857,2.7207 -4.9e-5,1.0368 0.377445,1.9299 1.130857,2.6837 0.75331,0.7541 1.646952,1.1328 2.683594,1.1328 1.036536,0 1.931414,-0.3787 2.685548,-1.1328 0.75402,-0.7538 1.130801,-1.6469 1.130859,-2.6837 -6e-5,-1.0827 -0.376839,-1.9903 -1.130859,-2.7207 -0.754134,-0.7302 -1.649012,-1.0957 -2.685548,-1.0957 z m -5.087889,8.4102 c -1.365875,0 -2.5319506,0.4813 -3.4980472,1.4473 -0.9661871,0.9663 -1.449263,2.1572 -1.4492188,3.5702 l 0,11.7287 c -4.42e-5,1.1315 0.5180514,1.6973 1.5546874,1.6973 0.9890979,0 1.4823738,-0.5658 1.482422,-1.6973 l 0,-11.4454 1.8378906,0 0,14.926 10.388672,0 0,-14.926 1.767578,0 0,11.4454 c -6e-5,1.1773 0.493216,1.7658 1.482422,1.7658 0.990517,0 1.486267,-0.5885 1.486328,-1.7658 l 0,-11.6602 c -6.1e-5,-1.3658 -0.460272,-2.5556 -1.378907,-3.5683 -0.918757,-1.0129 -2.107703,-1.5177 -3.568359,-1.5177 z"
+       id="flowRoot3192"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="scccscccsscccsccccccccscccss" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.30000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 22.85,1020.3622 0,32"
+       id="path4295-7-7-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.30000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 9.1500001,1020.3622 0,32"
+       id="path4295-7-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.30000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,1047.2322 32,0"
+       id="path4295-7"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,1047.2292 32,0"
+       id="path4295"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.30000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -4.9999999e-8,1034.8962 32,1034.8962"
+       id="path4295-7-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="M -5.0000001e-8,1034.8962 32,1034.8962"
+       id="path4295-5"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:4.30000019;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,1023.5632 32,0"
+       id="path4295-7-3-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 0,1023.5632 32,0"
+       id="path4295-5-6"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 9.1500001,1020.3592 0,32"
+       id="path4295-3"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 22.85,1020.3592 0,32"
+       id="path4295-3-4"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_restaurant.svg b/assets/layers/indoors/room_restaurant.svg
new file mode 100644
index 000000000..97b43c91a
--- /dev/null
+++ b/assets/layers/indoors/room_restaurant.svg
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg: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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="580"
+   height="580"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_restaurant.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="876"
+     id="namedview11"
+     showgrid="false"
+     inkscape:zoom="0.3194172"
+     inkscape:cx="288.16608"
+     inkscape:cy="351.43641"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <svg:metadata
+     id="metadata2975">
+    <RDF>
+      <Work
+         about="">
+        <format>image/svg+xml</format>
+        <type
+           resource="http://purl.org/dc/dcmitype/StillImage" />
+        <license
+           resource="http://web.resource.org/cc/PublicDomain" />
+        <language>en</language>
+      </Work>
+    </RDF>
+    <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>
+  </svg:metadata>
+  <svg:defs
+     id="defs4" />
+  <svg:path
+     d="m 203.725,338.602 c 37.643,-17.466 64.864,-67.996 64.864,-127.642 0,-74.115 -61.834,-155.247 -93.849,-155.247 -32.014,0 -93.85,81.132 -93.85,155.247 0,59.646 27.223,110.176 64.865,127.642 l -7.792,176.545 73.553,0 -7.791,-176.545 z"
+     style="fill:#000000;fill-opacity:1"
+     id="path2110"
+     inkscape:connector-curvature="0" />
+  <svg:path
+     d="m 430.231,368.602 c 37.642,-17.466 51.389,-39.928 51.389,-99.574 L 471.839,66.214 c 0,-3.875 -3.142,-7.017 -7.018,-7.017 l -4.607,0 c -3.873,0 -7.016,3.141 -7.016,7.017 l 3.26,202.814 -20.259,0 -5.132,-204.789 c 0,-3.875 -3.142,-7.017 -7.018,-7.017 l -5.995,0 c -3.874,0 -7.016,3.142 -7.016,7.017 l 2.775,204.789 -25.137,0 2.775,-204.789 c 0,-3.875 -3.142,-7.017 -7.017,-7.017 l -5.996,0 c -3.875,0 -7.016,3.142 -7.016,7.017 l -5.132,204.789 -19.835,0 3.26,-202.789 c 0,-3.875 -3.142,-7.017 -7.017,-7.017 l -4.606,0 c -3.875,0 -7.018,3.142 -7.018,7.017 L 320.9,269.028 c 0,59.646 13.715,82.108 51.356,99.574 l -7.791,146.545 73.554,0 -7.788,-146.545 z"
+     style="fill:#000000;fill-opacity:1"
+     id="path2112"
+     inkscape:connector-curvature="0" />
+</svg:svg>
diff --git a/assets/layers/indoors/room_security_check.svg b/assets/layers/indoors/room_security_check.svg
new file mode 100644
index 000000000..2cc0a3e05
--- /dev/null
+++ b/assets/layers/indoors/room_security_check.svg
@@ -0,0 +1,59 @@
+<?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"
+   width="404"
+   height="404"
+   version="1.1"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="Airport_Customs.svg">
+  <metadata
+     id="metadata12">
+    <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>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     id="namedview10"
+     showgrid="false"
+     inkscape:zoom="0.68604651"
+     inkscape:cx="27.813559"
+     inkscape:cy="172"
+     inkscape:window-x="1920"
+     inkscape:window-y="568"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <defs
+     id="defs4" />
+  <g
+     transform="translate(5,32)"
+     id="g6">
+    <path
+       d="m 47,126 -24,0 C 10,126 0,136 0,150 l 0,115 c 0,13 10,24 23,24 l 24,0 0,-163 z m 0,163 0,24 c 0,13 10,23 24,23 l 114,0 c 13,0 24,-10 24,-23 l 0,-24 -162,0 z m 286,-247 -71,0 -8,0 -20,20 20,0 0,5 c 0,24 20,43 43,43 24,0 43,-19 43,-43 l 0,-25 -7,0 z m 8,-14 -89,0 -18,-28 107,0 z m 32,98 0,0 -4,0 -108,138 88,0 0,25 -111,0 0,47 111,0 47,0 0,-47 0,-24 0,-88 0,-27 c 0,-14 -10,-24 -23,-24 z m -37,0 -102,0 -11,0 0,0 c -5,0 -9,2 -13,7 -30,38 -61,76 -91,115 -16,20 13,50 29,29 29,-36 57,-73 86,-109 l 0,89 102,-131 z"
+       id="path8"
+       inkscape:connector-curvature="0"
+       style="fill:#000000;stroke:none" />
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_sport.svg b/assets/layers/indoors/room_sport.svg
new file mode 100644
index 000000000..5a5949fe3
--- /dev/null
+++ b/assets/layers/indoors/room_sport.svg
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg: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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.0"
+   width="580"
+   height="580"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_sport.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="876"
+     id="namedview16"
+     showgrid="false"
+     inkscape:zoom="0.45172414"
+     inkscape:cx="290"
+     inkscape:cy="290"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <svg:metadata
+     id="metadata2975">
+    <RDF>
+      <Work
+         about="">
+        <format>image/svg+xml</format>
+        <type
+           resource="http://purl.org/dc/dcmitype/StillImage" />
+        <license
+           resource="http://web.resource.org/cc/PublicDomain" />
+        <language>en</language>
+      </Work>
+    </RDF>
+    <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>
+  </svg:metadata>
+  <svg:defs
+     id="defs4" />
+  <svg:circle
+     cx="123.427"
+     cy="496.92999"
+     r="33"
+     style="fill:#000000;fill-opacity:1"
+     id="circle2531"
+     sodipodi:cx="123.427"
+     sodipodi:cy="496.92999"
+     sodipodi:rx="33"
+     sodipodi:ry="33" />
+  <svg:circle
+     cx="428.427"
+     cy="470.92999"
+     r="59"
+     style="fill:#000000;fill-opacity:1"
+     id="circle2533"
+     sodipodi:cx="428.427"
+     sodipodi:cy="470.92999"
+     sodipodi:rx="59"
+     sodipodi:ry="59" />
+  <svg:path
+     d="m 415.364,390.179 -0.322,0.05 -301.628,51.934 c -26.487,4.862 -45.657,27.89 -45.657,54.768 0,30.696 24.974,55.67 55.67,55.67 l 305,0 c 45.033,0 81.67,-36.637 81.67,-81.67 0,-45.033 -36.637,-81.67 -81.67,-81.67 -6.581,-0.001 -12.036,0.764 -13.063,0.918 z m 2.069,13.845 c 0.524,-0.078 5.285,-0.765 10.994,-0.765 37.313,0 67.67,30.356 67.67,67.67 0,18.043 -7.048,35.028 -19.845,47.825 -12.797,12.797 -29.782,19.846 -47.825,19.846 l -305,0 c -22.977,0 -41.67,-18.693 -41.67,-41.67 0,-20.12 14.345,-37.356 34.108,-40.984 0,0 301.33,-51.882 301.479,-51.907 0.044,-0.008 0.089,-0.015 0.089,-0.015 z"
+     style="fill:#000000;fill-opacity:1"
+     id="path2535"
+     inkscape:connector-curvature="0" />
+  <svg:path
+     d="m 271.778,127.273 c -3.729,-9.387 -14.31,-13.998 -23.715,-10.392 l -45.53,18.081 c -0.961,0.212 -1.919,0.48 -2.864,0.856 -4.792,1.904 -8.334,5.596 -10.182,10.003 -1.934,4.367 -2.187,9.476 -0.284,14.265 0.375,0.944 0.836,1.824 1.342,2.668 l 18.102,45.524 c 3.833,9.315 14.448,13.845 23.834,10.115 9.386,-3.729 13.998,-14.311 10.391,-23.715 l -12.38,-31.176 31.171,-12.394 c 9.315,-3.833 13.845,-14.448 10.115,-23.835 z"
+     style="fill:#000000;fill-opacity:1"
+     id="path2537"
+     inkscape:connector-curvature="0" />
+  <svg:path
+     d="m 351.263,326.572 c -0.585,-1.015 -1.259,-1.943 -1.977,-2.823 l -28.247,-48.96 c -5.927,-9.997 -18.801,-13.401 -28.896,-7.58 -10.094,5.819 -13.597,18.669 -7.914,28.805 l 19.325,33.532 -33.523,19.341 c -9.996,5.927 -13.4,18.8 -7.579,28.896 5.82,10.095 18.668,13.599 28.805,7.915 l 48.976,-28.226 c 1.061,-0.401 2.108,-0.867 3.123,-1.452 5.151,-2.971 8.581,-7.773 9.958,-13.11 1.482,-5.308 0.92,-11.184 -2.051,-16.338 z"
+     style="fill:#000000;fill-opacity:1"
+     id="path2539"
+     inkscape:connector-curvature="0" />
+  <svg:circle
+     cx="336.24799"
+     cy="72.086998"
+     r="44"
+     style="fill:#000000;fill-opacity:1"
+     id="circle2541"
+     sodipodi:cx="336.24799"
+     sodipodi:cy="72.086998"
+     sodipodi:rx="44"
+     sodipodi:ry="44" />
+  <svg:path
+     d="m 402.479,164.292 c -4.765,-8.511 -15.484,-11.582 -24.03,-6.93 l -28.273,15.821 -20.548,-36.694 c -1.448,-6.397 -5.807,-12.042 -12.292,-14.839 -10.7,-4.615 -23.095,0.255 -27.826,10.87 L 178.514,389.862 c -4.65,10.782 0.321,23.291 11.103,27.94 10.782,4.65 23.291,-0.32 27.941,-11.103 l 96.837,-224.573 12.012,21.467 c 0.324,0.892 0.704,1.774 1.183,2.63 2.434,4.347 6.421,7.269 10.876,8.477 4.428,1.295 9.351,0.887 13.693,-1.545 0.855,-0.479 1.64,-1.033 2.383,-1.624 l 41.288,-23.13 c 8.431,-4.854 11.417,-15.596 6.649,-24.109 z"
+     style="fill:#000000;fill-opacity:1"
+     id="path2543"
+     inkscape:connector-curvature="0" />
+</svg:svg>
diff --git a/assets/layers/indoors/room_storage.svg b/assets/layers/indoors/room_storage.svg
new file mode 100644
index 000000000..2c6c28308
--- /dev/null
+++ b/assets/layers/indoors/room_storage.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="32"
+   height="32"
+   viewBox="0 0 32 32.000001"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_storage.svg">
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="2.02819 : 21.408131 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="29.366072 : 20.553572 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective4136" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="16"
+     inkscape:cx="11.042289"
+     inkscape:cy="16.288516"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     units="px"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata7">
+    <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>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <g
+       id="g4258"
+       transform="matrix(0.94281928,0,0,0.94554288,0.86460524,57.025384)">
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect4202"
+         d="m 0.469,1025.7313 15.061954,7.0999 0,19.0619 L 0.469,1044.7932 Z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.93809158;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect4202-9"
+         d="m 31.530977,1025.7603 -15.061954,7.0999 0,19.0619 15.061954,-7.0999 z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.93809158;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="rect4202-97"
+         d="m 16,1019.3222 14.931,5.8 -14.931,7.0003 -14.831,-7.0003 z"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.93809158;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccccc"
+         inkscape:connector-curvature="0"
+         id="path4254"
+         d="m 11.234,1021.1362 -4.08,1.577 15.660453,7.0348 -0.08984,6.9312 3.425782,-1.696 -0.02734,-7.3191 z"
+         style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:3.29999971;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/layers/indoors/room_technical.svg b/assets/layers/indoors/room_technical.svg
new file mode 100644
index 000000000..b058c935c
--- /dev/null
+++ b/assets/layers/indoors/room_technical.svg
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" width="100px" height="100px" viewBox="0 0 100 100" enable-background="new 0 0 100 100" xml:space="preserve">
+<g id="Captions">
+</g>
+<g id="Your_Icon">
+	<path d="M56.452,54.774l6.297-1.147c0.017-1.813-0.124-3.616-0.415-5.388l-6.397-0.192c-0.444-2.078-1.15-4.098-2.102-6.003   l4.879-4.143c-0.879-1.571-1.896-3.064-3.042-4.47l-5.637,3.035c-1.401-1.559-3.016-2.957-4.829-4.149l2.15-6.025   c-0.769-0.457-1.562-0.889-2.386-1.284c-0.82-0.395-1.646-0.741-2.479-1.059l-3.365,5.447c-2.062-0.673-4.163-1.065-6.258-1.189   l-1.149-6.296c-1.813-0.02-3.614,0.12-5.385,0.411l-0.193,6.397c-2.081,0.444-4.101,1.15-6.008,2.104l-4.146-4.878   c-1.565,0.882-3.059,1.898-4.46,3.042l3.032,5.633c-1.559,1.401-2.961,3.022-4.153,4.836C8.22,38.676,6.158,37.94,4.38,37.304   c-0.454,0.774-0.885,1.562-1.28,2.382s-0.742,1.649-1.062,2.486c1.607,0.993,3.466,2.144,5.443,3.365   c-0.67,2.062-1.062,4.166-1.187,6.261l-6.293,1.149c-0.02,1.811,0.121,3.61,0.412,5.385l6.397,0.189   c0.447,2.085,1.156,4.107,2.107,6.009L4.04,68.674c0.883,1.568,1.896,3.062,3.046,4.466l5.63-3.035   c1.408,1.559,3.025,2.957,4.835,4.149l-2.146,6.025c0.765,0.451,1.556,0.882,2.376,1.274c0.823,0.398,1.653,0.748,2.492,1.062   l3.366-5.44c2.058,0.67,4.159,1.062,6.25,1.184l1.15,6.296c1.813,0.02,3.613-0.124,5.388-0.412l0.196-6.4   c2.078-0.444,4.094-1.15,5.999-2.104l4.143,4.875c1.568-0.875,3.062-1.892,4.467-3.035l-3.032-5.64   c1.556-1.401,2.95-3.016,4.143-4.829l6.025,2.153c0.454-0.771,0.889-1.565,1.284-2.385c0.392-0.817,0.738-1.65,1.059-2.487   l-5.443-3.365C55.937,58.966,56.328,56.868,56.452,54.774z M42.814,58.783c-3.039,6.319-10.622,8.979-16.941,5.937   c-6.319-3.035-8.979-10.619-5.937-16.938c3.038-6.319,10.622-8.979,16.938-5.94C43.193,44.881,45.854,52.464,42.814,58.783z"/>
+	<path d="M93.942,35.007L100,32c-0.379-1.686-0.954-3.326-1.715-4.878l-6.61,1.435c-0.921-1.467-2.095-2.794-3.493-3.901l2.16-6.407   c-0.722-0.457-1.474-0.886-2.261-1.265c-0.791-0.379-1.592-0.699-2.401-0.977l-3.66,5.685c-1.738-0.398-3.506-0.489-5.228-0.29   l-3.006-6.058c-1.687,0.375-3.326,0.95-4.878,1.708l1.434,6.607c-1.47,0.918-2.803,2.091-3.917,3.492   c-2.255-0.761-4.474-1.506-6.407-2.159c-0.461,0.725-0.893,1.479-1.271,2.277c-0.379,0.78-0.695,1.574-0.974,2.378   c1.716,1.102,3.689,2.373,5.688,3.656c-0.408,1.748-0.496,3.522-0.297,5.254c-2.131,1.056-4.231,2.098-6.062,3.007   c0.376,1.683,0.948,3.319,1.706,4.871c1.996-0.435,4.283-0.931,6.606-1.435c0.925,1.48,2.104,2.816,3.516,3.935l-2.163,6.403   c0.723,0.458,1.471,0.883,2.265,1.262c0.784,0.379,1.584,0.699,2.389,0.98c1.104-1.716,2.368-3.689,3.659-5.692   c1.751,0.409,3.532,0.494,5.267,0.294l3,6.055c1.686-0.379,3.322-0.95,4.875-1.712c-0.435-1.993-0.932-4.283-1.435-6.61   c1.47-0.921,2.803-2.101,3.917-3.509l6.408,2.156c0.454-0.715,0.875-1.46,1.251-2.244c0.379-0.794,0.706-1.602,0.983-2.411   l-5.688-3.663C94.057,38.503,94.146,36.729,93.942,35.007z M85.052,39.917c-1.729,3.588-6.034,5.098-9.619,3.372   c-3.588-1.725-5.097-6.031-3.372-9.619c1.723-3.588,6.032-5.097,9.619-3.372C85.265,32.021,86.773,36.33,85.052,39.917z"/>
+</g>
+</svg>
\ No newline at end of file
diff --git a/assets/layers/indoors/room_toilets.svg b/assets/layers/indoors/room_toilets.svg
new file mode 100644
index 000000000..e41fc9954
--- /dev/null
+++ b/assets/layers/indoors/room_toilets.svg
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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.0"
+   width="580"
+   height="580"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_toilets.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape">
+  <metadata
+     id="metadata2975">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <cc:license
+           rdf:resource="http://web.resource.org/cc/PublicDomain" />
+        <dc:language>en</dc:language>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:window-height="876"
+     inkscape:window-width="1440"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     guidetolerance="10.0"
+     gridtolerance="10.0"
+     objecttolerance="10.0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base"
+     inkscape:zoom="0.65172414"
+     inkscape:cx="6.525895"
+     inkscape:cy="381.49096"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:current-layer="svg2"
+     showgrid="false"
+     inkscape:window-maximized="1" />
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 290 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="580 : 290 : 1"
+       inkscape:persp3d-origin="290 : 193.33333 : 1"
+       id="perspective2441" />
+    <inkscape:perspective
+       id="perspective3452"
+       inkscape:persp3d-origin="30 : 20 : 1"
+       inkscape:vp_z="60 : 30 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 30 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <symbol
+       viewBox="244.5 110 489 219.9"
+       id="symbol-university">
+      <path
+         id="path4460"
+         d="M79,43l57,119c0,0,21-96,104-96s124,106,124,106l43-133l82-17L0,17L79,43z" />
+      <path
+         id="path4462"
+         d="M94,176l-21,39"
+         stroke-width="20"
+         stroke="#000000"
+         fill="none" />
+      <path
+         id="path4464"
+         d="M300,19c0,10.5-22.6,19-50.5,19S199,29.5,199,19s22.6-19,50.5-19S300,8.5,300,19z" />
+      <path
+         id="path4466"
+         d="M112,216l-16-38L64,88c0,0-9-8-4-35s16-24,16-24"
+         stroke-width="20"
+         stroke="#000000"
+         ill="none" />
+    </symbol>
+    <inkscape:perspective
+       id="perspective4471"
+       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+       inkscape:vp_z="744.09448 : 526.18109 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 526.18109 : 1"
+       sodipodi:type="inkscape:persp3d" />
+    <inkscape:perspective
+       id="perspective4668"
+       inkscape:persp3d-origin="6 : 4 : 1"
+       inkscape:vp_z="12 : 6 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 6 : 1"
+       sodipodi:type="inkscape:persp3d" />
+  </defs>
+  <g
+     id="layer3"
+     inkscape:label="Layout"
+     style="display:none;stroke:#757575;stroke-opacity:1"
+     transform="matrix(48.14969,0,0,48.14969,-536.27327,-33.306752)">
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect4134"
+       width="10"
+       height="10"
+       x="1"
+       y="1" />
+    <rect
+       style="fill:none;stroke:#757575;stroke-width:0.10000000000000001;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline"
+       id="rect4136"
+       width="8"
+       height="8"
+       x="2"
+       y="2" />
+  </g>
+  <path
+     style="font-size:40px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:NPSPICT3;-inkscape-font-specification:NPSPICT3"
+     d="M 282.64529,512.4583 L 318.45711,512.4583 L 318.45711,61.17178 L 282.64529,61.17178 L 282.64529,512.4583 z M 174.96393,143.59872 L 102.68057,143.59872 C 91.409786,143.59908 81.273089,147.65375 72.270419,155.76278 C 65.507937,162.05819 61.006552,169.04048 58.766246,176.7097 L 27.675745,280.06296 C 26.782291,282.3173 26.335581,284.34465 26.335632,286.14498 C 26.335581,296.50868 31.510451,301.69043 41.860261,301.69023 C 49.076158,301.69043 53.811209,297.63574 56.065415,289.52617 L 84.434463,194.93518 L 99.959105,194.93518 L 53.343962,363.14964 L 98.618995,363.14964 L 98.618995,494.21221 C 98.61888,505.92269 104.24733,511.77792 115.50436,511.77794 C 126.76111,511.77792 132.38957,505.92269 132.38972,494.21221 L 132.38972,362.4899 L 149.29569,362.4899 L 149.29569,494.89257 C 149.29553,506.14948 154.92397,511.77792 166.18106,511.77794 C 177.43776,511.77792 183.06622,506.14948 183.06641,494.89257 L 183.06641,363.14964 L 228.32083,363.14964 L 181.04594,194.93518 L 197.25095,194.93518 L 225.62,289.52617 C 227.87388,297.63574 232.60206,301.69043 239.80454,301.69023 C 250.16776,301.69043 255.34951,296.50868 255.34978,286.14498 C 255.34951,283.89107 254.9028,281.86372 254.00968,280.06296 L 222.91917,176.7097 C 220.66479,169.49405 215.48992,162.51175 207.39454,155.76278 C 197.4844,147.65375 186.6742,143.59908 174.96393,143.59872 L 174.96393,143.59872 z M 140.51284,136.15597 C 150.86243,136.15632 159.64183,132.55522 166.85111,125.35263 C 174.06002,118.1508 177.66455,109.59472 177.66475,99.68441 C 177.66455,89.32131 174.06002,80.53845 166.85111,73.33581 C 159.64183,66.13403 150.86243,62.53293 140.51284,62.5325 C 130.60277,62.53293 122.04326,66.13403 114.8343,73.33581 C 107.62508,80.53845 104.02054,89.32131 104.02065,99.68441 C 104.02054,109.59472 107.62508,118.1508 114.8343,125.35263 C 122.04326,132.55522 130.60277,136.15632 140.51284,136.15597 L 140.51284,136.15597 z M 456.528,135.49621 C 466.43739,135.49658 474.9969,131.89203 482.20653,124.68258 C 489.41507,117.47387 493.01961,108.91436 493.02017,99.00405 C 493.01961,88.65469 489.41507,79.98867 482.20653,73.00595 C 474.9969,66.02408 466.43739,62.53293 456.528,62.5325 C 446.61756,62.53293 438.06149,66.02408 430.85977,73.00595 C 423.65706,79.98867 420.05596,88.65469 420.05644,99.00405 C 420.05596,108.91436 423.65706,117.47387 430.85977,124.68258 C 438.06149,131.89203 446.61756,135.49658 456.528,135.49621 L 456.528,135.49621 z M 504.50386,142.91837 L 407.89239,142.91837 C 394.83447,142.9187 383.68753,147.53693 374.45153,156.77301 C 365.21467,166.00978 360.59646,177.3835 360.59688,190.89423 L 360.59688,303.03034 C 360.59646,313.8476 365.55141,319.25613 375.46177,319.25595 C 384.91767,319.25613 389.64585,313.8476 389.64631,303.03034 L 389.64631,193.59506 L 407.21203,193.59506 L 407.21203,490.85163 C 407.21155,504.36266 413.96707,511.11818 427.47858,511.1182 C 440.98911,511.11818 447.74462,504.36266 447.74513,490.85163 L 447.74513,318.57559 L 465.31086,318.57559 L 465.31086,490.85163 C 465.31033,504.36266 472.06584,511.11818 485.57741,511.1182 C 499.54147,511.11818 506.52377,504.36266 506.52433,490.85163 L 506.52433,193.59506 L 523.4097,193.59506 L 523.4097,303.03034 C 523.40911,314.28743 528.13728,319.91587 537.59423,319.91571 C 547.06371,319.91587 551.79875,314.28743 551.79936,303.03034 L 551.79936,191.55397 C 551.79875,178.49682 547.40733,167.12653 538.62508,157.44307 C 529.84162,147.76028 518.4679,142.9187 504.50386,142.91837 L 504.50386,142.91837 z"
+     id="flowRoot3192"
+     sodipodi:nodetypes="ccccccccccssccccccsccccsccccccssccccccssssssscccsccssscccccsccsccccsccccsccccsccccc" />
+</svg>
diff --git a/assets/layers/indoors/room_waiting.svg b/assets/layers/indoors/room_waiting.svg
new file mode 100644
index 000000000..e3aacd19e
--- /dev/null
+++ b/assets/layers/indoors/room_waiting.svg
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="32"
+   height="32"
+   viewBox="0 0 31.999999 31.999998"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="room_waiting.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.839192"
+     inkscape:cx="12.783258"
+     inkscape:cy="16.863591"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1600"
+     inkscape:window-height="843"
+     inkscape:window-x="1440"
+     inkscape:window-y="512"
+     inkscape:window-maximized="1"
+     units="px" />
+  <metadata
+     id="metadata7">
+    <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 />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Calque 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1020.3622)">
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 7.4999987,1050.8622 0,-8"
+       id="path4161"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1.20468032px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 17.269441,1042.713 -10.1671017,0 0,-11.9833"
+       id="path4163"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.69376612;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 19.423256,1049.2451 0,-8.797 -9.751638,0"
+       id="path4165"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccc" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:3.8790226;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 10.269518,1039.8387 0,-10.5378"
+       id="path4167"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <ellipse
+       style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path4173"
+       cx="10.323376"
+       cy="1024.5038"
+       rx="2.6384292"
+       ry="2.6413507" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 16.199999,1050.8622 0,-8"
+       id="path4161-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cc" />
+    <g
+       id="g4162">
+      <circle
+         r="3.5126748"
+         cx="23.999998"
+         cy="1026.3623"
+         id="path4158"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.97464949;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path4160"
+         d="m 25.599997,1026.4304 -1.668157,0 0,-2.6682"
+         style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:0.6636861px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+    </g>
+  </g>
+</svg>
diff --git a/assets/themes/indoors/crest.svg b/assets/themes/indoors/crest.svg
deleted file mode 100644
index 383b543b1..000000000
--- a/assets/themes/indoors/crest.svg
+++ /dev/null
@@ -1,11 +0,0 @@
-<svg width="400" height="400" viewBox="0 0 400 400" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M397 200C397 308.8 308.8 397 200 397C91.1999 397 3 308.8 3 200C3 91.1999 91.1999 3 200 3C308.8 3 397 91.1999 397 200Z" fill="#22CA60" stroke="#E62222" stroke-width="6"/>
-<path d="M242.105 240.241L137.282 291.429L155.338 312.97L167.374 327.329L185.428 348.868L254.141 254.6L242.105 240.241Z" fill="#ECF0F1"/>
-<path d="M138.93 283.603L122.535 283.627L190.077 364.206L192.964 348.067L138.93 283.603Z" fill="#FE5757"/>
-<path d="M242.105 240.241L224.633 248.772L242.689 270.312L254.141 254.6L242.105 240.241ZM201.309 260.11L177.983 271.447L212.214 312.285L227.45 291.296L201.309 260.11ZM154.752 282.898L137.282 291.429L155.338 312.97L167.374 327.329L185.428 348.868L196.88 333.157L154.754 282.9L154.752 282.898Z" fill="#E62222"/>
-<path d="M122.535 283.627L190.077 364.206L185.257 368.246L117.714 287.667L122.535 283.627Z" fill="#E62222"/>
-<path d="M243.871 187.187C241.2 193.219 236.746 198.533 230.685 202.228C214.87 211.87 194.229 206.866 184.586 191.05C180.892 184.991 179.363 178.227 179.755 171.642L162.087 167.358C160.538 178.79 162.721 190.803 169.195 201.422C184.17 225.982 216.219 233.753 240.777 218.78C251.396 212.306 258.87 202.636 262.73 191.761L243.871 187.187Z" fill="#FCFCFF"/>
-<path d="M220.03 69.1601C228.136 64.2175 230.701 53.639 225.759 45.5323C220.816 37.4256 210.237 34.8606 202.131 39.8032C194.024 44.7458 191.459 55.3243 196.402 63.431C201.344 71.5377 211.923 74.1027 220.03 69.1601Z" fill="#FCFCFF"/>
-<path d="M250.824 98.9454L218.518 118.642L225.708 88.9832C225.995 88.2028 226.192 87.3988 226.294 86.5735L226.353 86.3324L226.329 86.3268C226.556 84.0714 226.115 81.7309 224.844 79.6478C222.814 76.3168 219.268 74.5145 215.635 74.5114L215.635 74.5081L159.854 75.8435L159.857 75.9264C158.38 76.1088 156.92 76.5767 155.568 77.4013C153.203 78.8428 151.63 81.0604 150.891 83.5185L150.871 83.5137L150.823 83.7119C150.755 83.956 150.696 84.1972 150.645 84.4453L143.544 113.732L143.57 113.739C143.012 116.342 143.389 119.153 144.885 121.608C147.987 126.696 154.623 128.303 159.709 125.202C162.164 123.706 163.786 121.379 164.482 118.809L164.509 118.816L164.574 118.548L164.58 118.522L169.753 97.19L185.053 96.8249L174.632 139.811C170.442 144.547 167.246 149.967 165.048 155.739L182.58 159.99C185.251 153.959 189.705 148.644 195.764 144.951C211.581 135.307 232.221 140.313 241.863 156.128C245.557 162.187 247.086 168.952 246.694 175.536L265.414 180.077C266.655 169.003 264.383 157.449 258.132 147.197C253.744 140 247.883 134.257 241.182 130.094L252.845 122.983L275.833 160.687C278.935 165.775 285.572 167.384 290.66 164.282C295.748 161.18 297.356 154.541 294.255 149.455L265.65 102.538C262.549 97.4527 255.91 95.8446 250.824 98.9454Z" fill="#FCFCFF"/>
-<path d="M104.007 155.511C105.121 154.899 105.528 153.5 104.917 152.386C104.305 151.272 102.905 150.865 101.791 151.476L95.7395 154.8C91.283 157.248 89.6546 162.845 92.1022 167.301C94.5498 171.758 100.147 173.386 104.603 170.938L130.828 156.535C131.942 155.923 132.349 154.524 131.737 153.41C131.125 152.296 129.726 151.889 128.612 152.501L102.387 166.904C100.159 168.128 97.3605 167.313 96.1367 165.085C94.9129 162.857 95.7272 160.059 97.9554 158.835L104.007 155.511ZM79.7999 168.806C80.914 168.194 81.3211 166.795 80.7092 165.681C80.0973 164.567 78.6981 164.16 77.584 164.772L73.5495 166.988C65.7507 171.271 62.9009 181.066 67.1842 188.864C71.4675 196.663 81.262 199.513 89.0608 195.23L145.544 164.207C146.659 163.595 147.066 162.196 146.454 161.082C145.842 159.968 144.443 159.56 143.329 160.172L86.8449 191.195C81.2743 194.255 74.2783 192.219 71.2187 186.648C68.1592 181.078 70.1948 174.082 75.7654 171.022L79.7999 168.806ZM136.054 185.174C137.168 184.562 137.575 183.163 136.963 182.049C136.351 180.935 134.952 180.528 133.838 181.14L103.579 197.759C99.1225 200.207 97.494 205.803 99.9417 210.26C102.389 214.716 107.986 216.345 112.443 213.897L118.494 210.573C119.608 209.961 120.016 208.562 119.404 207.448C118.792 206.334 117.393 205.927 116.278 206.539L110.227 209.863C107.998 211.086 105.2 210.272 103.976 208.044C102.752 205.816 103.567 203.017 105.795 201.793L136.054 185.174Z" fill="white"/>
-</svg>
diff --git a/assets/themes/indoors/indoors.json b/assets/themes/indoors/indoors.json
index ba3b93137..2b31cd0ad 100644
--- a/assets/themes/indoors/indoors.json
+++ b/assets/themes/indoors/indoors.json
@@ -19,7 +19,12 @@
   "startZoom": 14,
   "widenFactor": 2,
   "layers": [
-    "indoors",
+    {
+      "builtin": "indoors",
+      "override": {
+        "passAllFeatures": true
+      }
+    },
     {
       "builtin": [
         "walls_and_buildings"
@@ -29,6 +34,7 @@
       }
     },
     "pedestrian_path",
+    "elevator",
     "entrance"
   ]
 }
\ No newline at end of file
diff --git a/assets/themes/indoors/license_info.json b/assets/themes/indoors/license_info.json
deleted file mode 100644
index 9f2dcf81a..000000000
--- a/assets/themes/indoors/license_info.json
+++ /dev/null
@@ -1,10 +0,0 @@
-[
-  {
-    "path": "crest.svg",
-    "license": "CC0",
-    "authors": [
-      "Free Wheelies"
-    ],
-    "sources": []
-  }
-]
\ No newline at end of file
diff --git a/langs/layers/de.json b/langs/layers/de.json
index bad87f983..415e6729e 100644
--- a/langs/layers/de.json
+++ b/langs/layers/de.json
@@ -3438,7 +3438,9 @@
                 "question": "Ist dieser Aufzug in Betrieb?"
             }
         },
-        "title": "Aufzug",
+        "title": {
+            "render": "Aufzug"
+        },
         "units": {
             "0": {
                 "applicableUnits": {
diff --git a/langs/layers/en.json b/langs/layers/en.json
index cb3716588..50e29227e 100644
--- a/langs/layers/en.json
+++ b/langs/layers/en.json
@@ -3438,7 +3438,9 @@
                 "question": "Does this elevator work?"
             }
         },
-        "title": "Elevator",
+        "title": {
+            "render": "Elevator"
+        },
         "units": {
             "0": {
                 "applicableUnits": {
@@ -4213,6 +4215,38 @@
                 "question": "What color is the hydrant?",
                 "render": "The hydrant color is {colour}"
             },
+            "hydrant-couplings": {
+                "freeform": {
+                    "placeholder": "Coupling type"
+                },
+                "mappings": {
+                    "0": {
+                        "then": "Storz coupling"
+                    },
+                    "1": {
+                        "then": "UNI coupling"
+                    },
+                    "2": {
+                        "then": "Barcelona coupling"
+                    }
+                },
+                "question": "What kind of couplings does this hydrant have?",
+                "render": "Couplings: {couplings:type}"
+            },
+            "hydrant-couplings-diameters": {
+                "freeform": {
+                    "placeholder": "Coupling diameters"
+                },
+                "question": "What diameter are the couplings of this hydrant?",
+                "render": "Coupling diameters: {couplings:diameters}"
+            },
+            "hydrant-diameter": {
+                "freeform": {
+                    "placeholder": "Pipe diameter"
+                },
+                "question": "What is the pipe diameter of this hydrant?",
+                "render": "Pipe diameter: {canonical(fire_hydrant:diameter)}"
+            },
             "hydrant-state": {
                 "mappings": {
                     "0": {
@@ -4251,18 +4285,58 @@
         },
         "title": {
             "render": "Hydrant"
+        },
+        "units": {
+            "0": {
+                "applicableUnits": {
+                    "0": {
+                        "human": "millimeters",
+                        "humanSingular": "millimeter"
+                    }
+                }
+            }
         }
     },
     "indoors": {
         "description": "Basic indoor mapping: shows room outlines",
         "name": "indoors",
         "tagRenderings": {
-            "ref": {
+            "name": {
+                "freeform": {
+                    "placeholder": "Name of the room"
+                },
                 "question": "What is the name of this room?",
                 "render": "This room is named {name}"
+            },
+            "ref": {
+                "freeform": {
+                    "placeholder": "Reference number of the room (e.g. '1.1' or 'A1')"
+                },
+                "question": "What is the reference number of this room?",
+                "render": "This room has the reference number {ref}"
             }
         },
         "title": {
+            "mappings": {
+                "0": {
+                    "then": "Indoor Room {name}"
+                },
+                "1": {
+                    "then": "Indoor Area {name}"
+                },
+                "2": {
+                    "then": "Indoor Wall {name}"
+                },
+                "3": {
+                    "then": "Indoor Corridor {name}"
+                },
+                "4": {
+                    "then": "Indoor Door {name}"
+                },
+                "5": {
+                    "then": "Indoor Level {name}"
+                }
+            },
             "render": "Indoor area {name}"
         }
     },
diff --git a/langs/layers/fr.json b/langs/layers/fr.json
index 9416f2378..78753c279 100644
--- a/langs/layers/fr.json
+++ b/langs/layers/fr.json
@@ -2293,7 +2293,9 @@
                 "question": "Cet ascenseur fonctionne-t-il ?"
             }
         },
-        "title": "Ascenseur",
+        "title": {
+            "render": "Ascenseur"
+        },
         "units": {
             "0": {
                 "applicableUnits": {
diff --git a/langs/layers/nl.json b/langs/layers/nl.json
index 5e0a2b62b..df5ba4b81 100644
--- a/langs/layers/nl.json
+++ b/langs/layers/nl.json
@@ -3384,7 +3384,9 @@
                 "question": "Werkt deze lift?"
             }
         },
-        "title": "Lift",
+        "title": {
+            "render": "Lift"
+        },
         "units": {
             "0": {
                 "applicableUnits": {
@@ -4203,6 +4205,16 @@
         },
         "title": {
             "render": "Brandkraan"
+        },
+        "units": {
+            "0": {
+                "applicableUnits": {
+                    "0": {
+                        "human": "millimeter",
+                        "humanSingular": "millimeter"
+                    }
+                }
+            }
         }
     },
     "indoors": {