diff --git a/data/styles/clear/include/Basemap_label.mapcss b/data/styles/clear/include/Basemap_label.mapcss
index d609403f74..f5b5882c4d 100644
--- a/data/styles/clear/include/Basemap_label.mapcss
+++ b/data/styles/clear/include/Basemap_label.mapcss
@@ -269,15 +269,15 @@ node|z8[place=town][population>=40000]::int_name,
 node|z9[place=town][population>=20000]::int_name,
 {text:int_name;text-color: @city_label;}
 
-node|z10-11[place=town],
+node|z10-[place=town],
 {text: name; text-color: @city_label; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;}
-node|z10-11[place=town]::int_name,
+node|z10-[place=town]::int_name,
 {text:int_name; text-color: @city_label; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;}
 
-node|z12-[place=town][population<20000],
-{text: name;text-color: @label_medium;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
-node|z12-[place=town][population<20000]::int_name
-{text:int_name;text-color: @label_medium;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
+node|z12-[place=town],
+{text-color: @label_medium;}
+node|z12-[place=town]::int_name,
+{text-color: @label_medium;}
 
 node|z8[place=town][population>=40000]
 {font-size: 10;}
@@ -289,25 +289,25 @@ node|z9[place=town][population>=20000]
 node|z9[place=town][population>=20000]::int_name
 {font-size: 9;}
 
-node|z10[place=town][population>=0]
+node|z10[place=town],
 {font-size: 10;}
-node|z10[place=town][population>=0]::int_name
+node|z10[place=town]::int_name,
 {font-size: 9;}
 
-node|z11[place=town][population>=0]
+node|z11[place=town],
 {font-size: 11;}
-node|z11[place=town][population>=0]::int_name
+node|z11[place=town]::int_name,
 {font-size: 10;}
 
-node|z12[place=town][population>=0]
-{font-size: 12;text-halo-opacity: 1;}
-node|z12[place=town][population>=0]::int_name
-{font-size: 10;text-halo-opacity: 1;}
-
-node|z13-[place=town][population>=0]
-{font-size: 14;}
-node|z13-[place=town][population>=0]::int_name
+node|z12[place=town],
 {font-size: 12;}
+node|z12[place=town]::int_name,
+{font-size: 10;}
+
+node|z13-[place=town],
+{font-size: 14; text-halo-opacity: 1;}
+node|z13-[place=town]::int_name,
+{font-size: 12; text-halo-opacity: 1;}
 
 /* 4.3 Village */
 
@@ -316,7 +316,7 @@ node|z11-[place=village]
 node|z11-[place=village]::int_name
 {text:int_name;text-color: @city_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 node|z13-[place=hamlet]
-{text: name;text-color: @label_light;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
+{text: name;text-color: @city_label;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 
 node|z11[place=village]
 {font-size: 10;}
@@ -329,9 +329,9 @@ node|z12[place=village]::int_name
 {font-size: 9;}
 
 node|z13-[place=village]
-{font-size: 12;text-color: @label_medium;text-halo-opacity: 0.8;}
+{font-size: 12;text-color: @label_medium;}
 node|z13-[place=village]::int_name
-{font-size: 10;text-color: @label_medium;text-halo-opacity: 0.8;}
+{font-size: 10;text-color: @label_medium;}
 
 node|z13-[place=hamlet]
 {font-size: 11;}
diff --git a/data/styles/vehicle/include/Basemap_label.mapcss b/data/styles/vehicle/include/Basemap_label.mapcss
index 2eec73eaab..4dbab1b672 100644
--- a/data/styles/vehicle/include/Basemap_label.mapcss
+++ b/data/styles/vehicle/include/Basemap_label.mapcss
@@ -236,45 +236,40 @@ node|z8[place=town][population>=40000]::int_name,
 node|z9[place=town][population>=20000]::int_name,
 {text:int_name;text-color: @city_label;}
 
-node|z10-11[place=town],
+node|z10-[place=town],
 {text: name; text-color: @city_label; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;}
-node|z10-11[place=town]::int_name,
+node|z10-[place=town]::int_name,
 {text:int_name; text-color: @city_label; text-halo-radius: 1; text-halo-opacity: 0.8; text-halo-color: @label_halo_light;}
 
-node|z12-[place=town][population<20000],
-{text: name;text-color: @label_medium;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
-node|z12-[place=town][population<20000]::int_name
-{text:int_name;text-color: @label_medium;text-halo-radius: 1;text-halo-opacity: 0.8;text-halo-color: @label_halo_light;}
+node|z12-[place=town],
+{text-color: @label_medium;}
+node|z12-[place=town]::int_name,
+{text-color: @label_medium;}
 
 node|z8[place=town][population>=40000]
 {font-size: 10;}
 node|z8[place=town][population>=40000]::int_name
 {font-size: 9;}
 
-node|z9[place=town][population>=20000]
+node|z10[place=town],
 {font-size: 10;}
-node|z9[place=town][population>=20000]::int_name
+node|z10[place=town]::int_name,
 {font-size: 9;}
 
-node|z10[place=town][population>=0]
-{font-size: 10;}
-node|z10[place=town][population>=0]::int_name
-{font-size: 9;}
-
-node|z11[place=town][population>=0]
+node|z11[place=town],
 {font-size: 11;}
-node|z11[place=town][population>=0]::int_name
+node|z11[place=town]::int_name,
 {font-size: 10;}
 
-node|z12[place=town][population>=0]
-{font-size: 12;text-halo-opacity: 1;}
-node|z12[place=town][population>=0]::int_name
-{font-size: 10;text-halo-opacity: 1;}
-
-node|z13-[place=town][population>=0]
-{font-size: 14;}
-node|z13-[place=town][population>=0]::int_name
+node|z12[place=town],
 {font-size: 12;}
+node|z12[place=town]::int_name,
+{font-size: 10;}
+
+node|z13-[place=town],
+{font-size: 14; text-halo-opacity: 1;}
+node|z13-[place=town]::int_name,
+{font-size: 12; text-halo-opacity: 1;}
 
 /* 4.3 Village */
 
@@ -283,7 +278,7 @@ node|z11-[place=village]
 node|z11-[place=village]::int_name
 {text:int_name;text-color: @city_label;text-halo-radius: 1;text-halo-opacity: 0.7;text-halo-color: @label_halo_light;}
 node|z13-[place=hamlet]
-{text: name;text-color: @label_light;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
+{text: name;text-color: @city_label;text-halo-radius: 1;text-halo-opacity: 0.6;text-halo-color: @label_halo_light;}
 
 node|z11[place=village]
 {font-size: 10;}
@@ -296,9 +291,9 @@ node|z12[place=village]::int_name
 {font-size: 9;}
 
 node|z13-[place=village]
-{font-size: 12;text-color: @label_medium;text-halo-opacity: 0.8;}
+{font-size: 12;text-color: @label_medium;}
 node|z13-[place=village]::int_name
-{font-size: 10;text-color: @label_medium;text-halo-opacity: 0.8;}
+{font-size: 10;text-color: @label_medium;}
 
 node|z13-[place=hamlet]
 {font-size: 11;}