Index: /trunk/resources/data/defaultpresets.xml
===================================================================
--- /trunk/resources/data/defaultpresets.xml	(revision 18037)
+++ /trunk/resources/data/defaultpresets.xml	(revision 18038)
@@ -5428,5 +5428,5 @@
             <preset_link preset_name="Address" />
         </item> <!-- Building -->
-        <item name="Residential Building" icon="presets/landmark/building.svg" type="node,closedway,multipolygon" preset_name_label="true">
+        <item name="Residential Building" icon="presets/landmark/building.svg" type="node,closedway,multipolygon" preset_name_label="true" match_expression="building=(yes|residential|apartments|ger|house|hotel|hut|bungalow|dormitory|terrace|detached|farm)">
             <link wiki="Key:building" />
             <space />
Index: /trunk/resources/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/resources/styles/standard/elemstyles.mapcss	(revision 18037)
+++ /trunk/resources/styles/standard/elemstyles.mapcss	(revision 18038)
@@ -905,4 +905,5 @@
 node[highway=pedestrian],
 node[highway=bus_guideway],
+node[highway=busway],
 node[highway=platform] {
     icon-image: "presets/misc/deprecated.svg";
@@ -5496,4 +5497,5 @@
 way|z18-[highway=bridleway][setting("highway_labels")],
 way|z18-[highway=bus_guideway][setting("highway_labels")],
+way|z18-[highway=busway][setting("highway_labels")],
 way|z18-[highway=raceway][setting("highway_labels")],
 way|z18-[highway=construction][setting("highway_labels")],
@@ -5554,4 +5556,7 @@
     text-halo-color: rail#404040;
 }
+way|z18-[highway=busway][setting("highway_labels")] {
+    text-halo-color: bus#89cbeb;
+}
 way|z18-[highway=raceway][setting("highway_labels")] {
     text-halo-color: raceway#ff80ff;