--- J:\style3\points
+++ J:\style3\points.new
@@ -86,29 +86,23 @@
 
 include 'inc/name';
 
-place=city & population > 999999 & name=* [0x0100 resolution 12]
-place=city & population > 799999 & name=* [0x0200 resolution 14]
-place=city & population > 399999 & name=* [0x0300 resolution 15]
-place=city & population > 299999 & name=* [0x0400 resolution 16]
-place=city & population > 199999 & name=* [0x0500 resolution 16]
-place=city & population >  99999 & name=* [0x0600 resolution 17]
-place=city & population >  49999 & name=* [0x0700 resolution 17]
-place=city & population >   9999 & name=* [0x0800 resolution 18]
-
-place=city & population >      0 & name=* [0x0800 resolution 18]
-place=city                       & name=* [0x0700 resolution 18]
-
-place=town & population >  69999 & name=* [0x0600 resolution 17]
-place=town & population >  19999 & name=* [0x0700 resolution 18]
-place=town & population >   9999 & name=* [0x0800 resolution 19]
-place=town & population >   4999 & name=* [0x0900 resolution 19]
-place=town & population >    999 & name=* [0x0a00 resolution 19]
-place=town & population >      0 & name=* [0x0b00 resolution 20]
-place=town                       & name=* [0x0800 resolution 19]
-
-place=village                    & name=* [0x0900 resolution 22]
-place=suburb                     & name=* [0x0a00 resolution 22]
-place=hamlet                     & name=* [0x0b00 resolution 24]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population > 19999999 & name=* [0x0100 resolution 12]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >  9999999 & name=* [0x0200 resolution 12]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >  4999999 & name=* [0x0300 resolution 13]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >  1999999 & name=* [0x0400 resolution 14]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >   999999 & name=* [0x0500 resolution 14]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >   499999 & name=* [0x0600 resolution 15]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >   199999 & name=* [0x0700 resolution 15]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >    99999 & name=* [0x0800 resolution 16]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >    49999 & name=* [0x0900 resolution 16]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >    19999 & name=* [0x0a00 resolution 17]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >     9999 & name=* [0x0b00 resolution 17]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >     4999 & name=* [0x0c00 resolution 18]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >     1999 & name=* [0x0d00 resolution 18]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >      999 & name=* [0x0e00 resolution 19]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >      599 & name=* [0x0f00 resolution 19]
+(place=city | place=town | place=village | place=suburb | place=hamlet ) & population >        0 & name=* [0x1000 resolution 20]
+(place=city | place=town | place=village | place=suburb | place=hamlet )                         & name=* [0x1100 resolution 20]
 
 place=island & name=* [0x650c resolution 20]
 place=islet  & name=* [0x650c resolution 22]
@@ -329,7 +323,7 @@
 tourism=wine_cellar [0x2c0a resolution 24]
 tourism=zoo [0x2c07 resolution 24]
 tourism=* & name!=* & tourism!=yes & tourism!=no {set name='${tourism|subst:"_=> "}'}
-tourism=* & tourism!=no & tmp:stopMopUp!=yes [0x2c0d resolution 24]
+tourism=* & tourism!=no & tmp:stopMopUp!=yes [0x2f00 resolution 24]
 
 # amenity=restaurant/fast_food/cafe/pub and shop=* can use cuisine, so have cuisine section later than where the others
 # should take precedence
@@ -342,19 +336,19 @@
 #     Seafood, Steak/Grill, Bagel/Donut, Cafe/Diner, French, German, British Isles, Speciality Food Products, Other
 amenity=restaurant & cuisine!=*
     [0x2a00 resolution 24]
-cuisine=american | cuisine=burger
+cuisine=american
     [0x2a01 resolution 24]
-cuisine=asian | cuisine=japanese | cuisine=indian | cuisine=curry | cuisine=thai | cuisine=sushi | cuisine=korean
+cuisine=asian | cuisine=japanese | cuisine=indian | cuisine=curry | cuisine=thai | cuisine=sushi | cuisine=korean | cuisine=chinese | cuisine=vietnamese
     [0x2a02 resolution 24]
-cuisine=barbecue | cuisine=bbq | cuisine=kebab | cuisine=chicken
+cuisine=barbecue | cuisine=bbq | cuisine=kebab
     [0x2a03 resolution 24]
-cuisine=chinese | cuisine=vietnamese
+cuisine=chicken
     [0x2a04 resolution 24]
 cuisine=deli | cuisine=sandwich
     [0x2a05 resolution 24]
 cuisine=international
     [0x2a06 resolution 24]
-cuisine=fast_food
+cuisine=fast_food | cuisine=burger 
     [0x2a07 resolution 24]
 cuisine~'.*pizza.*'
     [0x2a0a resolution 24]