Index: /trunk/data/defaultpresets.xml
===================================================================
--- /trunk/data/defaultpresets.xml	(revision 14866)
+++ /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 14866)
+++ /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 14866)
+++ /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";
+}
Index: /trunk/images/presets/religion/confucian.svg
===================================================================
--- /trunk/images/presets/religion/confucian.svg	(revision 14867)
+++ /trunk/images/presets/religion/confucian.svg	(revision 14867)
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="svg10"
+   width="665"
+   height="665"
+   viewBox="0 0 665 665"
+   pagecolor="#ffffff"
+   sodipodi:docname="confucian7.svg"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)">
+  <metadata
+     id="metadata16">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs14">
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3723">
+      <use
+         x="0"
+         y="0"
+         xlink:href="#g3719"
+         id="use3725"
+         width="100%"
+         height="100%" />
+    </clipPath>
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     id="namedview12"
+     showgrid="true"
+     inkscape:zoom="1"
+     inkscape:cx="271.75541"
+     inkscape:cy="274.36847"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg10">
+    <inkscape:grid
+       type="xygrid"
+       id="grid817" />
+  </sodipodi:namedview>
+  <rect
+     style="fill:#ffffff;stroke-width:0.90632135"
+     id="WhiteBackground"
+     width="499.70901"
+     height="664.58582"
+     x="80.781746"
+     y="0.41421756"
+     inkscape:label="#rect3714" />
+  <g
+     id="g3721"
+     clip-path="url(#clipPath3723)"
+     transform="matrix(1.0204212,0,0,1,-1.6496639,0)">
+    <g
+       inkscape:label="Clip"
+       id="g3719">
+      <path
+         inkscape:label="#path20"
+         inkscape:connector-curvature="0"
+         id="Bell"
+         d="M 489.5,615.33964 C 427.93033,593.96337 391.74543,583.51667 363,578.81867 c -11.25147,-1.83888 -17.41411,-2.20146 -37,-2.17691 -20.81509,0.0261 -25.15665,0.32569 -38,2.62235 -30.13325,5.38844 -58.49644,13.46145 -120.736,34.36509 -22.1298,7.43246 -41.2548,13.36895 -42.5,13.19219 -1.93344,-0.27447 -2.30828,-1.00946 -2.56726,-5.03399 -0.18465,-2.86937 14.00491,-90.09144 36.27834,-223 20.11989,-120.05807 36.69815,-218.67527 36.84058,-219.14934 0.28995,-0.96505 18.18425,-8.65283 64.61656,-27.76064 17.28772,-7.11424 32.02522,-13.42714 32.75,-14.02865 1.80713,-1.49978 1.86649,-22.16699 0.0678,-23.59915 -0.6875,-0.5474 -4.49823,-1.21639 -8.46829,-1.48666 C 272.45144,111.95762 270,109.19311 270,96.657407 270,85.412848 272.49515,83.064282 285.46796,82.098165 L 293.5,81.5 293.63923,65.386934 c 0.19767,-22.874842 2.90003,-30.970509 11.16442,-33.445987 2.32499,-0.696419 10.62358,-0.983601 22.36799,-0.774068 18.32187,0.326881 18.72175,0.379951 21.34731,2.833121 6.04139,5.644714 6.86634,8.857068 7.44739,29 l 0.53366,18.5 7.86191,0.638299 c 5.50451,0.446905 8.65293,1.228889 10.5,2.60792 C 377.42785,86.661976 377.5,87.010766 377.5,97.5 c 0,10.34183 -0.10254,10.86023 -2.5,12.63892 -1.5005,1.11323 -5.09869,2.11101 -9,2.49571 -10.35903,1.0215 -10.10982,0.67329 -9.78226,13.66782 L 356.5,137.5 l 27,10.72889 c 14.85,5.90088 36.24641,14.56338 47.54758,19.25 11.30116,4.68661 21.0621,8.52111 21.69098,8.52111 0.62887,0 1.40511,0.42344 1.72497,0.94099 0.53043,0.85826 34.56208,199.41024 58.02874,338.55901 5.28701,31.35 11.61411,68.62227 14.06023,82.82726 2.44613,14.20499 4.4475,26.69249 4.4475,27.75 0,1.45045 -0.67549,1.9029 -2.75,1.84195 -1.5125,-0.0444 -18.95,-5.70524 -38.75,-12.57957 z M 500.11069,538.75 c 0.28485,-3.21676 -0.71656,-8.53252 -7.67674,-40.75 -4.09931,-18.975 -8.17743,-36.15455 -9.06248,-38.17678 -2.02075,-4.61716 -5.85127,-8.20974 -10.36309,-9.71936 -8.29529,-2.77556 -31.04107,-3.19181 -158.50838,-2.90073 l -130,0.29687 -4.99264,2.5 c -9.38946,4.70165 -10.2699,6.73637 -17.77484,41.07808 -9.51673,43.54741 -9.95341,48.7071 -4.00556,47.32916 1.52517,-0.35334 21.89804,-5.95965 45.27304,-12.45847 59.97536,-16.67461 73.4105,-19.74953 95.85595,-21.93872 13.48132,-1.31488 40.23469,-1.28747 51.64405,0.0529 20.74847,2.43755 50.38576,9.20421 83,18.95023 3.85,1.15048 10.825,3.14519 15.5,4.43268 14.29957,3.93809 40.47522,11.70585 40.91667,12.14224 1.07533,1.06301 10.09131,0.32175 10.19402,-0.83811 z M 206,411.37271 c 0,-0.345 -1.40191,-3.47497 -3.11536,-6.95548 -2.774,-5.63479 -3.07249,-7.08695 -2.7241,-13.25268 0.31958,-5.65567 0.98204,-7.87483 3.61537,-12.11096 C 205.54916,376.20103 207,373.44701 207,372.93355 207,372.40018 201.0319,372 193.07755,372 H 179.1551 l -1.04321,3.25 c -1.77585,5.53244 -6.15415,33.47631 -5.50868,35.15836 C 173.12737,411.77431 175.53844,412 189.60699,412 198.62314,412 206,411.71772 206,411.37271 Z m 72.88948,-2.43138 c 1.48152,-2.43616 2.00598,-6.084 2.57691,-17.92369 0.39425,-8.17576 0.42028,-15.79936 0.0578,-16.94133 C 280.89035,372.07917 280.20053,372 263.43261,372 253.77586,372 246,372.40123 246,372.89951 c 0,0.49473 1.61582,3.30061 3.59072,6.23529 3.52945,5.24476 3.58456,5.48104 3.23011,13.85049 -0.30554,7.2145 -0.7775,9.16066 -3.09072,12.74484 C 248.22855,408.0567 247,410.4192 247,410.98013 247,411.62801 252.47653,412 262.0147,412 h 15.0147 z m 124.57332,2.11886 c 0.31946,-0.5169 -0.89148,-3.03027 -2.69098,-5.58527 -3.0983,-4.39909 -3.27182,-5.11401 -3.27182,-13.47979 0,-8.39323 0.1658,-9.06949 3.3206,-13.54413 1.95736,-2.77623 2.95267,-5.07773 2.42439,-5.60601 -0.49291,-0.49291 -8.28718,-0.77218 -17.3206,-0.6206 L 369.5,372.5 l -0.32685,7 c -0.61036,13.07202 0.80024,27.19646 2.99473,29.98629 1.94807,2.47657 2.18956,2.51371 16.34568,2.51371 7.90262,0 14.62978,-0.42291 14.94924,-0.93981 z m 75.01989,-1.39342 c 1.39549,-2.12979 1.2732,-3.74791 -1.40245,-18.55777 -1.61218,-8.92349 -3.46986,-16.87354 -4.12818,-17.66677 C 471.23875,371.37782 445,371.31711 445,373.37756 c 0,0.75765 0.74632,1.99515 1.65848,2.75 3.12393,2.58515 5.2976,9.0978 5.2976,15.87244 0,6.77464 -2.17367,13.28729 -5.2976,15.87244 -0.91216,0.75485 -1.65848,1.99235 -1.65848,2.75 0,1.1126 3.07305,1.37756 15.97695,1.37756 15.63407,0 16.00975,-0.0501 17.50574,-2.33323 z M 217,339.72784 c 0,-0.69968 -1.27608,-2.83718 -2.83573,-4.75 C 210.41234,330.37633 209,325.95708 209,318.81866 c 0,-6.91585 1.74532,-11.5815 6.50545,-17.39062 C 219.82992,296.1506 219.52569,296 204.54066,296 c -8.52425,0 -11.58418,0.34752 -12.47124,1.41635 C 190.82245,298.91887 185,330.30012 185,335.51843 c 0,1.69486 0.54,3.62157 1.2,4.28157 1.75856,1.75856 30.8,1.69052 30.8,-0.0722 z m 66.73189,0.0222 c 1.59863,-2.04579 3.59637,-40.64955 2.19122,-42.34264 C 285.00976,296.30683 281.32986,296 269.04422,296 c -8.64099,0 -15.99367,0.28278 -16.33929,0.6284 -0.34562,0.34562 0.87334,2.48312 2.70881,4.75 6.0175,7.43189 6.86014,10.01004 6.40219,19.58838 -0.38788,8.11291 -0.63101,8.91102 -4.09764,13.45112 -2.02691,2.65457 -3.44116,5.2215 -3.14277,5.70429 0.89195,1.44321 28.00827,1.09706 29.15637,-0.37219 z M 396,339.97589 c 0,-0.56326 -1.575,-3.31375 -3.5,-6.11221 -3.32143,-4.82851 -3.5,-5.51858 -3.5,-13.52555 0,-9.27531 0.78238,-11.49459 6.43931,-18.26548 1.95872,-2.34444 3.30962,-4.66988 3.00198,-5.16764 C 398.13366,296.40726 390.98862,296 382.56343,296 c -11.61527,0 -15.58851,0.3253 -16.43528,1.34559 -0.8122,0.97864 -0.85107,6.66893 -0.14255,20.86582 0.5358,10.73612 1.25638,20.25561 1.60128,21.15441 C 368.12555,340.76955 370.17314,341 382.10699,341 390.92035,341 396,340.62556 396,339.97589 Z m 69.64414,-1.55552 c 1.60504,-2.44962 1.55224,-3.39468 -1.04758,-18.75 -3.17427,-18.74816 -4.1259,-22.27578 -6.22672,-23.08194 -2.02631,-0.77757 -24.86308,-0.76186 -25.64258,0.0176 -0.33334,0.33334 1.1513,2.82932 3.2992,5.54662 4.52964,5.73042 5.9602,10.07616 5.96796,18.12943 0.006,6.10992 -1.62074,11.15607 -4.96781,15.41119 -3.95649,5.02985 -3.30698,5.30669 12.45034,5.30669 14.45777,0 14.47918,-0.003 16.16719,-2.57963 z M 227.30807,260.3586 c 0.35277,-0.35277 -1.07629,-2.71527 -3.17569,-5.25 C 219.42441,249.42439 218,245.40832 218,237.81866 c 0,-6.45652 1.54808,-11.04853 5.44881,-16.16266 1.40315,-1.83963 2.55119,-3.86481 2.55119,-4.50039 0,-1.38187 -17.72634,-1.61514 -19.86308,-0.26139 -1.61457,1.02292 -8.36866,38.30281 -7.41045,40.90276 0.34521,0.93666 1.11047,2.03363 1.70059,2.43771 1.31802,0.9025 25.98869,1.01622 26.88101,0.12391 z m 60.92182,-0.73134 c 1.86502,-1.86503 4.25021,-40.34385 2.62238,-42.30527 C 289.38621,215.5555 263,215.39788 263,217.15561 c 0,0.63558 1.0583,2.54808 2.35179,4.25 4.48751,5.9045 5.64821,9.25439 5.64821,16.30133 0,8.94794 -1.156,12.61645 -5.48583,17.40906 -1.97018,2.18075 -3.31529,4.39677 -2.98914,4.9245 0.97764,1.58186 24.08118,1.21044 25.70486,-0.41324 z M 390,259.97589 c 0,-0.56326 -1.55999,-3.29193 -3.46664,-6.06371 -4.09385,-5.95141 -4.97627,-9.80567 -4.26725,-18.63856 0.44831,-5.58499 1.11425,-7.37126 4.58051,-12.28641 2.23077,-3.16323 3.77786,-6.02939 3.43799,-6.36926 C 389.94474,216.27808 383.94677,216 376.95578,216 c -9.95565,0 -12.97499,0.31822 -13.92926,1.46804 -1.4878,1.79269 -0.38,40.28933 1.21673,42.28196 1.26859,1.58314 25.75675,1.79791 25.75675,0.22589 z m 60.67072,0.24878 c 0.64389,-0.40959 1.46123,-1.9022 1.8163,-3.31692 0.74566,-2.97094 -5.1241,-37.76554 -6.68906,-39.65119 C 444.40463,215.5777 427,215.48423 427,217.15561 c 0,0.63558 1.0583,2.54808 2.35179,4.25 4.78804,6.29993 5.64821,9.0966 5.64821,18.36412 0,8.77632 -0.0415,8.92471 -3.97123,14.19171 -2.18417,2.92746 -3.73262,5.70873 -3.44098,6.1806 0.64823,1.04886 21.44691,1.12331 23.08293,0.0826 z M 332.96056,135.02111 C 336.53673,133.1072 337,128.66343 337,96.273854 v -31.4277 l -2.92308,-2.923077 C 331.49344,59.339598 330.45432,59 325.13269,59 c -4.9221,0 -6.53331,0.440319 -8.82693,2.412277 L 313.5,63.824553 313.20655,95.662277 c -0.1614,17.510743 -0.0375,32.861673 0.27543,34.113163 1.15717,4.62841 3.99934,6.22456 11.08376,6.22456 3.61116,0 7.38883,-0.4405 8.39482,-0.97889 z"
+         style="fill:#000000" />
+    </g>
+  </g>
+</svg>
Index: /trunk/images/presets/religion/tenrikyo.svg
===================================================================
--- /trunk/images/presets/religion/tenrikyo.svg	(revision 14867)
+++ /trunk/images/presets/religion/tenrikyo.svg	(revision 14867)
@@ -0,0 +1,392 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg2"
+   sodipodi:version="0.32"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   version="1.0"
+   sodipodi:docname="tenrikyo3.svg"
+   inkscape:export-filename="/media/D/Akihiko/Akihiko Novo/Pessoal/Projetos/Site Mikunibras/Reformulacao/Images/tenrikyo_emblem_easy_editable.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:modified="true"
+   pagecolor="#ffffff"
+   viewBox="0 0 16 16">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     gridtolerance="10000"
+     guidetolerance="10"
+     objecttolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="31.951302"
+     inkscape:cx="-0.14045676"
+     inkscape:cy="7.6439263"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer18"
+     inkscape:window-width="1680"
+     inkscape:window-height="987"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     width="744.09px"
+     height="1052.3622px"
+     showgrid="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     viewbox-x="-30"
+     viewbox-y="30"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid845" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     style="display:inline"
+     transform="translate(-27.750002,-842.61183)">
+    <ellipse
+       style="display:inline;opacity:1;fill:#000000;fill-rule:evenodd;stroke:none;stroke-width:1.29307675;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2191"
+       transform="matrix(0.99994714,0.01028229,0,1,0,0)"
+       inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       cx="35.751892"
+       cy="850.2442"
+       rx="7.00037"
+       ry="6.99963" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer18"
+     inkscape:label="Outside Circle"
+     style="display:inline;opacity:1"
+     transform="translate(-27.750002,-842.61183)">
+    <ellipse
+       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.07819784;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2807"
+       transform="matrix(0.99994714,0.01028228,0,1,0,0)"
+       inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       cx="35.751892"
+       cy="850.24426"
+       rx="5.8370733"
+       ry="5.8364563" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer28"
+     inkscape:label="Daggers"
+     style="display:inline;opacity:1"
+     transform="translate(-27.750002,-842.61183)">
+    <path
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.03551107px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="m 35.6823,846.92336 -3.388514,2.64627 1.419951,4.00168 4.163037,-0.12909 1.355403,-3.80805 z"
+       id="path13562"
+       inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer1"
+     inkscape:label="Five Circles and Sticks Borders"
+     style="display:inline"
+     transform="translate(-27.750002,-842.61183)">
+    <g
+       id="g5158"
+       style="fill:#ffffff"
+       transform="matrix(0.02058823,0,0,0.02058826,28.178682,839.93453)">
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         y="391.10175"
+         x="346.90826"
+         height="125.048"
+         width="41.682667"
+         id="rect12655"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="rotate(-36.297057)"
+         y="625.82776"
+         x="-31.444723"
+         height="125.53841"
+         width="41.846134"
+         id="rect13547"
+         style="fill:#ffffff;fill-opacity:1;stroke-width:33;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="rotate(34.640059)"
+         y="203.44701"
+         x="574.9314"
+         height="125.53812"
+         width="41.846043"
+         id="rect13553"
+         style="fill:#ffffff;fill-opacity:1;stroke-width:33;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="rotate(-71.254027)"
+         y="402.24527"
+         x="-394.6936"
+         height="125.53836"
+         width="41.846119"
+         id="rect13556"
+         style="fill:#ffffff;fill-opacity:1;stroke-width:33;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="rotate(-108.24048)"
+         y="179.10356"
+         x="-629.85974"
+         height="125.53826"
+         width="41.846088"
+         id="rect13550"
+         style="fill:#ffffff;fill-opacity:1;stroke-width:33;stroke-miterlimit:4;stroke-dasharray:none" />
+      <ellipse
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="matrix(1.856281,0,0,1.962354,-1009.531,-10.95022)"
+         id="path2804"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.7504735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="741.95703"
+         cy="181.10561"
+         rx="56.063465"
+         ry="53.033009" />
+      <ellipse
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="matrix(1.856281,0,0,1.962354,-907.7207,306.383)"
+         id="path2801"
+         style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.7504735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="741.95703"
+         cy="181.10561"
+         rx="56.063465"
+         ry="53.033009" />
+      <ellipse
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="matrix(1.856281,0,0,1.962354,-1113.464,301.8346)"
+         id="path2798"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.7504735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="741.95703"
+         cy="181.10561"
+         rx="56.063465"
+         ry="53.033009" />
+      <ellipse
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="matrix(1.856281,0,0,1.962354,-1176.044,107.6139)"
+         id="path2795"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.7504735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="741.95703"
+         cy="181.10561"
+         rx="56.063465"
+         ry="53.033009" />
+      <ellipse
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="matrix(1.856281,0,0,1.962354,-844.0797,111.101)"
+         id="path2792"
+         style="display:inline;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4.7504735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="741.95703"
+         cy="181.10561"
+         rx="56.063465"
+         ry="53.033009" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="Five Circles and Sticks"
+     style="display:inline;opacity:1"
+     transform="translate(-27.750002,-842.61183)">
+    <g
+       id="g5146"
+       style="fill:#000000"
+       transform="matrix(0.02036664,0,0,0.02036667,28.260053,840.04601)">
+      <path
+         id="path6383"
+         d="m 463.81406,344.44299 c 0.79683,47.69239 -37.51472,89.32098 -81.44089,94.9566 -45.79883,8.13416 -95.81043,-22.61821 -107.66146,-70.95782 -11.72983,-42.2015 10.31383,-89.55775 47.26037,-108.463 42.88161,-24.27255 101.94335,-9.39812 127.92807,34.6636 9.01388,14.74712 13.96107,32.2304 13.91391,49.80062 z"
+         style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:4.7504735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         inkscape:connector-curvature="0" />
+      <ellipse
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="matrix(1.71349,0,0,1.811403,-801.7761,333.7208)"
+         id="path6396"
+         style="display:inline;fill:#000000;stroke:none;stroke-width:4.7504735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="741.95703"
+         cy="181.10561"
+         rx="56.063465"
+         ry="53.033009" />
+      <ellipse
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="matrix(1.71349,0,0,1.811403,-1007.519,329.1725)"
+         id="path6389"
+         style="display:inline;fill:#000000;fill-opacity:1;stroke:none;stroke-width:4.7504735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="741.95703"
+         cy="181.10561"
+         rx="56.063465"
+         ry="53.033009" />
+      <ellipse
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="matrix(1.71349,0,0,1.811403,-1070.099,134.9517)"
+         id="path6394"
+         style="display:inline;fill:#000000;stroke:none;stroke-width:4.7504735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="741.95703"
+         cy="181.10561"
+         rx="56.063465"
+         ry="53.033009" />
+      <ellipse
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="matrix(1.71349,0,0,1.811403,-738.1351,138.4389)"
+         id="path6399"
+         style="display:inline;fill:#000000;stroke:none;stroke-width:4.7504735;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         cx="741.95703"
+         cy="181.10561"
+         rx="56.063465"
+         ry="53.033009" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         y="411.94308"
+         x="353.85538"
+         height="83.365334"
+         width="27.788446"
+         id="rect9064"
+         style="display:inline;fill:#000000;stroke:none;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="rotate(-36.297057)"
+         y="649.36609"
+         x="-23.598534"
+         height="78.461472"
+         width="26.153824"
+         id="rect9067"
+         style="display:inline;fill:#000000;stroke-width:33;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="rotate(34.640059)"
+         y="226.98538"
+         x="582.77789"
+         height="78.461357"
+         width="26.153784"
+         id="rect9070"
+         style="display:inline;fill:#000000;stroke-width:33;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="rotate(-71.254027)"
+         y="425.78333"
+         x="-386.84729"
+         height="78.461433"
+         width="26.153811"
+         id="rect9074"
+         style="display:inline;fill:#000000;stroke-width:33;stroke-miterlimit:4;stroke-dasharray:none" />
+      <rect
+         inkscape:export-ydpi="90"
+         inkscape:export-xdpi="90"
+         inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+         transform="rotate(-108.24048)"
+         y="202.64211"
+         x="-622.01373"
+         height="78.461433"
+         width="26.153814"
+         id="rect10849"
+         style="display:inline;fill:#000000;stroke-width:33;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer19"
+     inkscape:label="Central Circle Border"
+     style="display:inline"
+     transform="translate(-27.750002,-842.61183)">
+    <ellipse
+       style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.19531092;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path2805"
+       inkscape:export-filename="/home/denakitan/Desktop/path5495.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       cx="35.749886"
+       cy="850.6084"
+       rx="0.87889946"
+       ry="0.87889928" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer3"
+     inkscape:label="Central Circle"
+     style="display:inline;opacity:1"
+     transform="translate(-27.750002,-842.61183)">
+    <ellipse
+       style="fill:#000000;stroke:none;stroke-width:0.15979977;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="path5495"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       cx="35.749886"
+       cy="850.6084"
+       rx="0.71910006"
+       ry="0.71909815" />
+  </g>
+</svg>
Index: /trunk/styles/standard/elemstyles.mapcss
===================================================================
--- /trunk/styles/standard/elemstyles.mapcss	(revision 14866)
+++ /trunk/styles/standard/elemstyles.mapcss	(revision 14867)
@@ -2661,8 +2661,16 @@
     set icon_z17;
 }
+node[amenity=place_of_worship][religion=caodaism][!is_prop_set(icon-image)] {
+    icon-image: "presets/misc/no_icon.svg";
+    set icon_z17;
+}
 node[amenity=place_of_worship][religion=christian] {
     icon-image: "presets/religion/church.svg";
     set icon_z17;
 }
+node[amenity=place_of_worship][religion=confucian] {
+    icon-image: "presets/religion/confucian.svg";
+    set icon_z17;
+}
 node[amenity=place_of_worship][religion=hindu] {
     icon-image: "presets/religion/hinduism.svg";
@@ -2681,12 +2689,12 @@
     set icon_z17;
 }
+node[amenity=place_of_worship][religion=shinto] {
+    icon-image: "presets/religion/shinto.svg";
+    set icon_z17;
+}
 node[amenity=place_of_worship][religion=sikh] {
     icon-image: "presets/religion/sikhism.svg";
     set icon_z17;
 }
-node[amenity=place_of_worship][religion=shinto] {
-    icon-image: "presets/religion/shinto.svg";
-    set icon_z17;
-}
 node[amenity=place_of_worship][religion=spiritualist][!is_prop_set(icon-image)] {
     icon-image: "presets/misc/no_icon.svg";
@@ -2697,5 +2705,9 @@
     set icon_z17;
 }
-node[amenity=place_of_worship][religion=unitarian][!is_prop_set(icon-image)] {
+node[amenity=place_of_worship][religion=tenrikyo] {
+    icon-image: "presets/religion/tenrikyo.svg";
+    set icon_z17;
+}
+node[amenity=place_of_worship][religion=unitarian_universalist][!is_prop_set(icon-image)] {
     icon-image: "presets/misc/no_icon.svg";
     set icon_z17;