diff --git a/symbol sets/ISOM2000-ISOM 2017-2.crt b/symbol sets/ISOM2000-ISOM 2017-2.crt
new file mode 100644
index 000000000..33589e6fa
--- /dev/null
+++ b/symbol sets/ISOM2000-ISOM 2017-2.crt
@@ -0,0 +1,168 @@
+#
+# (C) 2017, 2019 Kai Pastor
+#
+# This file is part of OpenOrienteering.
+#
+# OpenOrienteering is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# OpenOrienteering is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenOrienteering. If not, see .
+
+101 101
+102 102
+103 103
+101.1 104
+102.1 105
+104 106
+104.9 106.0.1
+104 106.1
+104.9 106.1.1
+104.3 106.2
+105 107
+106 108
+107 109
+108 110
+109 112
+110 113
+111 115
+112 116
+113.1 117.1
+113.1 117.2
+115 118
+201 201
+201.9 201.0.1
+201.3 201.1
+201.4 201.2
+201.2 202
+202.2 203
+202.9 203.0.1
+202 203.1
+202.1 203.1.1
+202 203.2
+202.1 203.2.1
+203.1 204
+203.9 205
+204 206
+204.5 206.1
+205 207
+208.1 208
+208.2 208.1
+207 209
+207.1 209.1
+210.1 210
+210.1 210.1
+213 211
+214 212
+301.1 301
+301.4 301.1
+301 301.2
+301 302
+303 303
+304 305
+305 306
+306 307
+309 308
+307.1 309
+307.2 309.1
+307 309.2
+308 310
+308.1 310.1
+310 311
+310.1 311.1
+311 312
+312 313
+313 314
+401 401
+402 402
+403 403
+404 404
+405 405
+406 406
+407 407
+408 408
+409 409
+410 410
+410.4 410.1
+406.1 411.0
+408.1 411.1
+410.1 411.2
+413 412
+414 413
+415 414
+412 415
+416 416
+419 418
+417 419
+418 420
+502.2 501.0
+502.1 502
+502 503
+503 504
+504 505
+505 506
+506 507
+507 508
+508 509
+512.2 512
+509 515
+510 516
+511 517
+512 518
+512.1 518.1
+513 519
+514 520
+515 521
+516 522
+517 523
+518 524
+519 525
+521 526
+521.1 526.1
+520 527
+520.2 527.1
+520.2 528
+520.3 528.1
+501.1 529
+501.2 529.1
+501 529.2
+523 530
+523.1 530.2
+528 533
+529 534
+524 535
+525 536
+526 537
+527 538
+530 539
+531 540
+601.1 601
+601.2 601.1
+601.3 601.2
+601.4 601.3
+602 602
+603.0 603.0
+603.1 603.1
+701 701
+703 702
+704 703
+705 704
+707 705
+706 706
+708 707
+710 708
+709 709
+709.1 709.1
+709.2 709.2
+711.1 711
+712 712
+713 713
+799 799
+999 999
diff --git a/symbol sets/ISOM2017-ISOM 2017-2.crt b/symbol sets/ISOM2017-ISOM 2017-2.crt
new file mode 100644
index 000000000..1dae4dd87
--- /dev/null
+++ b/symbol sets/ISOM2017-ISOM 2017-2.crt
@@ -0,0 +1,66 @@
+#
+# (C) 2019 Kai Pastor
+#
+# This file is part of OpenOrienteering.
+#
+# OpenOrienteering is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# OpenOrienteering is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenOrienteering. If not, see .
+
+# Bank line moved behind the new "Uncrossable body of water (dominant)" symbols.
+301.4 301.2
+
+# "Vegetation, impassable, minimum width" is retained as "Vegetation, fight".
+410.4 411.2
+
+# Other variants of "Vegetation, impassable" shall be reviewed manually.
+411 411
+411 411.1
+
+# No-op rules that help match symbols with changed names.
+201.2 201.2
+203.1 203.1
+203.2 203.2
+301 301
+301.1 301.1
+302 302
+307 307
+307.2 307.2
+402.1 402.1
+404 404
+404.1 404.1
+406 406
+406.1 406.1
+407 407
+408 408
+408.1 408.1
+408.2 408.2
+409 409
+410 410
+410.1 410.1
+410.2 410.2
+410.3 410.3
+413.1 413.1
+414 414
+414.1 414.1
+502.1 502.1
+508.1 508.1
+508.2 508.2
+508.3 508.3
+508.4 508.4
+520.1 520.1
+520.2 520.2
+520.3 520.3
+521.4 521.4
+522.2 522.2
+710 710
+
diff --git a/symbol sets/OSM-ISOM 2017-2.crt b/symbol sets/OSM-ISOM 2017-2.crt
new file mode 100644
index 000000000..1bb16348c
--- /dev/null
+++ b/symbol sets/OSM-ISOM 2017-2.crt
@@ -0,0 +1,172 @@
+#
+# (C) 2017, 2019 Kai Pastor
+#
+# Based on ISOM_rules.yaml from https://github.com/sembruk/osm2xmap/ rev 3c6cdb5
+#
+# (C) 2016 Semyon Yakimov
+#
+# This file is part of OpenOrienteering.
+#
+# OpenOrienteering is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# OpenOrienteering is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with OpenOrienteering. If not, see .
+
+109 natural = ant_hill
+111 natural = depression
+107 natural = gully
+111 natural = hollow
+109 natural = knoll
+109 natural = termite_mount
+
+214 natural = bare_rock
+213 natural = beach AND surface = sand
+203.9 natural = cave_entrance
+201 natural = cliff
+201.2 natural = cliff AND area = yes
+213 natural = dune
+203.1 natural = hole AND rock != no
+201.2 natural = rock AND area = yes
+213 natural = sand
+205 natural = stone
+
+303 natural = hole AND water = yes
+312 natural = spring
+301 natural = water
+308 natural = wetland
+310 natural = wetland AND intermittent = yes
+307.1 natural = wetland AND foot = impassable
+
+418 natural = bush
+403 natural = grassland
+408 natural = scrub
+417 natural = tree
+406 natural = wood
+408 natural = wood AND (wood:age = young OR wood:age = very_young)
+404 natural = wood AND wood:density = sparse
+408 natural = wood AND wood:density = dense
+
+304 waterway = canal
+306 waterway = ditch
+305 waterway = drain
+306 waterway = drain AND intermittent = yes
+304 waterway = river
+301 waterway = riverbank
+305 waterway = stream
+306 waterway = stream AND intermittent = yes
+
+520 landuse = allotments
+520.2 landuse = cemetery
+520 landuse = commercial
+# 710 landuse = construction
+412 landuse = farmland
+520 landuse = farmyard
+406 landuse = forest
+401 landuse = grass
+520 landuse = industrial
+# 710 landuse = landfill
+403 landuse = logging
+401 landuse = meadow
+709 landuse = military
+413 landuse = orchard
+301 landuse = reservoir
+# 710 landuse = quarry
+213 landuse = quarry AND resource = sand
+520 landuse = residential
+414 landuse = vineyard
+
+401 leisure = park
+401 leisure = pitch
+
+503 highway = cycleway
+
+505 highway = footway
+
+526 highway = milestone
+
+502.2 highway = motorway
+502.1 highway = motorway_link
+
+506 highway = path
+505 highway = path AND (smoothness = good OR smoothness = intermediate)
+506 highway = path AND (smoothness = bad OR smoothness = very_bad)
+507 highway = path AND (smoothness = horrible OR smoothness = very_horrible)
+
+502.1 highway = primary
+502.1 highway = secondary
+502.1 highway = tertiary
+
+504 highway = track
+503 highway = track AND (smoothness = good OR smoothness = intermediate)
+504 highway = track AND (smoothness = bad OR smoothness = very_bad)
+505 highway = track AND (smoothness = horrible OR smoothness = very_horrible)
+
+502.1 highway = trunk AND lanes = 2
+502.1 highway = trunk_link AND lanes = 1
+
+503 (highway = unclassified OR highway = residential OR highway = service OR highway = living_street)
+502 (highway = unclassified OR highway = residential OR highway = service OR highway = living_street) AND (surface = asphalt OR surface = concrete OR surface = concrete:plates OR surface = concrete:lanes)
+# 503.1 (highway = unclassified OR highway = residential OR highway = service OR highway = living_street) AND (surface = compacted OR surface = gravel)
+503 (highway = unclassified OR highway = residential OR highway = service OR highway = living_street) AND (surface = ground OR surface = sand OR surface = unpaved)
+504 (highway = unclassified OR highway = residential) AND (surface = grass OR surface = dirt)
+
+509 railway ~= "" AND railway != "abandoned" AND tunnel != "yes"
+
+523 building = ruins
+521 building ~= "" AND building != ruins
+523 building ~= "" AND building != ruins AND ruins = yes
+523 building ~= "" AND building != ruins AND historic = ruins
+
+526 man_made = cairn
+524 man_made = chimney
+508 man_made = cutline
+524 man_made = lighthouse
+524 man_made = mast
+109 man_made = mound
+528 man_made = pipeline AND location = overhead
+529 man_made = pipeline AND location = overground
+526 man_made = survey_point
+524 man_made = tower
+524 man_made = water_tower
+311 man_made = water_well
+
+531 amenity = bench
+313 amenity = drinking_water
+527 amenity = feeding_place
+311 amenity = fountain
+525 amenity = hunting_stand
+501 amenity = parking
+709 amenity = prison
+521 amenity = shelter
+313 amenity = watering_place
+
+510 aerialway ~= "" AND aerialway != no
+
+511 power = line
+510 power = minor_line
+
+108 barrier = ditch
+518 barrier = fence
+517 barrier = fence AND ruins = yes
+410.4 barrier = hedge
+410 barrier = hedge AND area = yes
+515 barrier = wall
+514 barrier = wall AND ruins = yes
+
+521 tourism = alpine_hut
+531 tourism = artwork
+521 tourism = chalet
+
+526 historic = boundary_stone
+
+531 pipeline = marker
+
+713 shop = convenience