Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 14861)
+++ trunk/data/defaultpresets.xml	(revision 14867)
@@ -281,9 +281,33 @@
         </combo>
     </chunk>
-    <chunk id="religious">
-        <text key="name" text="Name" />
-        <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
-        <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,jehovahs_witness,lutheran,methodist,mormon,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,shia,sunni" />
-    </chunk>
+    <!-- start of religions and denominations -->
+        <chunk id="religious"> <!-- all religions and denominations -->
+            <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
+            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
+        </chunk>
+        <chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
+            <combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
+            <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
+        </chunk>
+        <chunk id="other_religions"> <!-- religions which don't have an own preset -->
+            <combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
+        </chunk> 
+        <chunk id="christian_denominations"> <!-- christian denominations -->
+            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
+        </chunk>
+        <chunk id="muslim_denominations"> <!-- muslim denominations -->
+            <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
+        </chunk>
+        <chunk id="jewish_denominations"> <!-- jewish denominations -->
+            <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
+        </chunk>
+        <chunk id="buddhist_denominations"> <!-- buddhist denominations -->
+            <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
+        </chunk>
+        <chunk id="hindu_denominations"> <!-- hindu denominations -->
+            <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
+        </chunk>
+        <!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
+    <!-- end of religions and denominations --> 
     <chunk id="voltage">
         <combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,15000;200000,110000;20000" />
@@ -3273,5 +3297,5 @@
             <text key="name" text="Name" />
             <combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
-            <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_context="christian" values_searchable="true" />
+            <reference ref="christian_denominations" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
@@ -3286,5 +3310,5 @@
             <text key="name" text="Name" />
             <combo key="building" text="Building type" values="mosque" values_searchable="true" />
-            <combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
+            <reference ref="muslim_denominations" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
@@ -3299,5 +3323,5 @@
             <text key="name" text="Name" />
             <combo key="building" text="Building type" values="synagogue" values_searchable="true" />
-            <combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" />
+            <reference ref="jewish_denominations" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
@@ -3311,5 +3335,5 @@
             <key key="religion" value="buddhist" />
             <text key="name" text="Name" />
-            <combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
+            <reference ref="buddhist_denominations" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
@@ -3323,5 +3347,5 @@
             <key key="religion" value="hindu" />
             <text key="name" text="Name" />
-            <combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
+            <reference ref="hindu_denominations" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
@@ -3345,5 +3369,5 @@
             <key key="amenity" value="place_of_worship" />
             <text key="name" text="Name" />
-            <combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue!" values_searchable="true" />
+            <reference ref="other_religions" />
             <reference ref="service_times" />
             <reference ref="oh_wheelchair" />
@@ -5354,6 +5378,5 @@
             <key key="historic" value="wayside_cross" />
             <text key="name" text="Name" />
-            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" default="christian" />
-            <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" />
+            <reference ref="religious_catholic_christian" />
             <text key="start_date" text="Start date" />
             <text key="inscription" text="Inscription" />
@@ -5364,6 +5387,5 @@
             <key key="historic" value="wayside_shrine" />
             <text key="name" text="Name" />
-            <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" default="christian" />
-            <combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" />
+            <reference ref="religious_catholic_christian" />
             <check key="amenity" text="Place of worship" value_on="place_of_worship" disable_off="true" />
             <combo key="building" text="Building" values="wayside_shrine,yes" values_context="building" />
@@ -5981,6 +6003,5 @@
             <reference ref="name_operator_oh_wheelchair" />
             <optional>
-                <combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
-                <combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
+                <reference ref="religious" />
             </optional>
             <reference ref="link_contact_address_payment" />
@@ -6237,4 +6258,5 @@
         <space />
         <key key="office" value="religion" />
+        <text key="name" text="Name" />
         <reference ref="religious" />
         <reference ref="oh_wheelchair" />
@@ -6954,4 +6976,5 @@
             <space />
             <key key="amenity" value="grave_yard" />
+            <text key="name" text="Name" />
             <reference ref="religious" />
         </item> <!-- Graveyard -->
@@ -6960,4 +6983,5 @@
             <space />
             <key key="landuse" value="cemetery" />
+            <text key="name" text="Name" />
             <reference ref="religious" />
         </item> <!-- Cemetery -->
@@ -6966,4 +6990,5 @@
             <space />
             <key key="landuse" value="religious" />
+            <text key="name" text="Name" />
             <reference ref="religious" />
         </item> <!-- Religious -->
Index: trunk/data/validator/deprecated.mapcss
===================================================================
--- trunk/data/validator/deprecated.mapcss	(revision 14861)
+++ trunk/data/validator/deprecated.mapcss	(revision 14867)
@@ -1389,2 +1389,10 @@
   group: tr("deprecated tagging");
 }
+
+/* #17249 */
+*[religion=unitarian] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "religion=unitarian_universalist";
+  fixAdd: "religion=unitarian_universalist";
+  group: tr("deprecated tagging");
+}
Index: trunk/data/validator/religion.mapcss
===================================================================
--- trunk/data/validator/religion.mapcss	(revision 14861)
+++ trunk/data/validator/religion.mapcss	(revision 14867)
@@ -9,5 +9,5 @@
 }
 
-*[religion=christian][denomination][denomination !~ /^(anglican|apostolic|baptist|catholic|christian_community|christian_scientist|coptic_orthodox|czechoslovak_hussite|dutch_reformed|evangelical|foursquare|greek_catholic|greek_orthodox|jehovahs_witness|kabbalah|karaite|living_waters_church|lutheran|maronite|mennonite|methodist|mormon|new_apostolic|nondenominational|old_catholic|orthodox|pentecostal|presbyterian|protestant|quaker|roman_catholic|russian_orthodox|salvation_army|serbian_orthodox|seventh_day_adventist|spiritist|united|united_reformed|uniting)$/] {
+*[religion=christian][denomination][denomination !~ /^(anglican|apostolic|baptist|catholic|church_of_scotland|christian_community|christian_scientist|coptic_orthodox|czechoslovak_hussite|dutch_reformed|evangelical|foursquare|greek_catholic|greek_orthodox|iglesia_ni_cristo|jehovahs_witness|kabbalah|karaite|living_waters_church|lutheran|maronite|mennonite|methodist|mormon|new_apostolic|nondenominational|old_catholic|orthodox|pentecostal|presbyterian|protestant|quaker|reformed|roman_catholic|romanian_orthodox|russian_orthodox|salvation_army|serbian_orthodox|seventh_day_adventist|spiritist|united|united_reformed|united|united_methodist|united_reformed|uniting)$/] {
   throwOther: tr("unknown christian denomination");
   assertMatch: "node religion=christian denomination=foobar";
@@ -29,2 +29,9 @@
   assertNoMatch: "node religion=jewish";
 }
+
+*[religion=catholic] {
+  throwWarning: tr("{0}", "{0.tag}");
+  suggestAlternative: "religion=christian + denomination=catholic";
+  fixChangeKey: "religion => denomination";
+  fixAdd: "religion=christian";
+}