Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 7519)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 7520)
@@ -30,4 +30,10 @@
   type: boolean;
   label: tr("Less obtrusive node symbols at low zoom");
+  default: true;
+}
+
+setting::highway_labels {
+  type: boolean;
+  label: tr("Display street labels (at high zoom)");
   default: true;
 }
@@ -4335,15 +4341,15 @@
 /*******************/
 
-way|z17-[highway^=motorway],
-way|z17-[highway^=trunk],
-way|z17-[highway^=primary],
-way|z17-[highway^=secondary],
-way|z17-[highway^=tertiary],
-way|z17-[highway=unclassified],
-way|z17-[highway=residential],
-way|z17-[highway=living_street],
-way|z17-[highway=pedestrian][!area?],
-way|z17-[highway=service],
-way|z17-[highway=track] {
+way|z17-[highway^=motorway][setting("highway_labels")],
+way|z17-[highway^=trunk][setting("highway_labels")],
+way|z17-[highway^=primary][setting("highway_labels")],
+way|z17-[highway^=secondary][setting("highway_labels")],
+way|z17-[highway^=tertiary][setting("highway_labels")],
+way|z17-[highway=unclassified][setting("highway_labels")],
+way|z17-[highway=residential][setting("highway_labels")],
+way|z17-[highway=living_street][setting("highway_labels")],
+way|z17-[highway=pedestrian][!area?][setting("highway_labels")],
+way|z17-[highway=service][setting("highway_labels")],
+way|z17-[highway=track][setting("highway_labels")] {
     text: auto;
     text-color: black;
@@ -4353,40 +4359,40 @@
     text-halo-radius: 1.5;
 }
-way|z17-[highway^=motorway] {
+way|z17-[highway^=motorway][setting("highway_labels")] {
     text-halo-color: motorway#809bc0;
 }
-way|z17-[highway^=trunk] {
+way|z17-[highway^=trunk][setting("highway_labels")] {
     text-halo-color: trunk#7fc97f;
 }
-way|z17-[highway^=primary] {
+way|z17-[highway^=primary][setting("highway_labels")] {
     text-halo-color: primary#fb805f;
 }
-way|z17-[highway^=secondary] {
+way|z17-[highway^=secondary][setting("highway_labels")] {
     text-halo-color: secondary#fdbf6f;
 }
-way|z17-[highway^=tertiary] {
+way|z17-[highway^=tertiary][setting("highway_labels")] {
     text-halo-color: tertiary#f7f496;
 }
-way|z17-[highway=unclassified],
-way|z17-[highway=residential],
-way|z17-[highway=living_street] {
+way|z17-[highway=unclassified][setting("highway_labels")],
+way|z17-[highway=residential][setting("highway_labels")],
+way|z17-[highway=living_street][setting("highway_labels")] {
     text-halo-color: street#c0c0c0;
 }
-way[highway=pedestrian][!area?] {
+way[highway=pedestrian][!area?][setting("highway_labels")] {
     text-halo-color: foot#00ff00;
 }
-way|z17-[highway=service] {
+way|z17-[highway=service][setting("highway_labels")] {
     text-halo-color: service#809bc0;
 }
-way|z17-[highway=track] {
+way|z17-[highway=track][setting("highway_labels")] {
     text-halo-color: highway_track#006600;
 }
-way|z18[highway] {
+way|z18[highway][setting("highway_labels")] {
     font-size: 10;
 }
-way|z19[highway] {
+way|z19[highway][setting("highway_labels")] {
     font-size: 11;
 }
-way|z20-[highway] {
+way|z20-[highway][setting("highway_labels")] {
     font-size: 12;
 }