theming changes:

- select="first" also add its renderstyles when no sub-rule matched
  ... before they where only added when one subrule matched

- use select="when-matched" as last subrule in select="first" rules
  instead.

vtm-themes/resources/assets/styles/default.xml

@@ -1064,8 +1064,11 @@
         <m k="amenity" v="cinema">
           <symbol src="cinema" />
         </m>
+
+        <m select="when-matched">
           <text use="poi" />
         </m>
+      </m>
 
       <m zoom-min="16" select="first">
         <m v="atm" zoom-min="17">
@@ -1089,8 +1092,10 @@
         <m k="amenity" v="bus_station">
           <symbol src="bus_station" />
         </m>
+        <m select="when-matched">
           <text use="poi" />
         </m>
+      </m>
 
       <m zoom-min="17" select="first">
         <m k="amenity" v="bank">
@@ -1152,8 +1157,10 @@
         <m k="amenity" v="theatre">
           <symbol src="theatre" />
         </m>
+        <m select="when-matched">
           <text use="poi" />
         </m>
+      </m>
 
       <m zoom-min="17">
         <m k="amenity" v="toilets">
@@ -1176,17 +1183,18 @@
         <m v="supermarket|organic">
           <symbol src="shop_supermarket" />
         </m>
-        <m>
+
+        <m zoom-min="17">
           <symbol src="city" />
         </m>
-      </m>
-      <m zoom-min="17">
+
+        <m select="when-matched" zoom-min="17">
           <text use="poi" />
         </m>
       </m>
+    </m>
 
     <m k="tourism">
-
       <m zoom-min="15" select="first">
         <m v="alpine_hut">
           <symbol src="triangle-stroked" />
@@ -1200,8 +1208,11 @@
         <m v="hotel">
           <symbol src="hotel" />
         </m>
+
+        <m select="when-matched">
           <text use="poi" />
         </m>
+      </m>
 
       <m zoom-min="16" select="first">
         <m v="information" select="first">

vtm-themes/resources/assets/styles/tronrender.xml

@@ -1312,7 +1312,7 @@
     </m>
 
 
-    <m k="tourism">
+    <m k="tourism" select="first">
       <m v="alpine_hut" zoom-min="16">
         <symbol src="alpine_hut" />
       </m>
@@ -1332,7 +1332,7 @@
         <symbol src="viewpoint" />
       </m>
 
-      <m zoom-min="17">
+      <m select="when-matched" zoom-min="17">
         <text use="caption-small-blue" />
       </m>
     </m>