diff --git a/bin/osmosis/lib/default/mapsforge-core-0.6.0.jar b/bin/osmosis/lib/default/mapsforge-core-0.6.0.jar
deleted file mode 100644
index ed3bf31..0000000
Binary files a/bin/osmosis/lib/default/mapsforge-core-0.6.0.jar and /dev/null differ
diff --git a/bin/osmosis/lib/default/mapsforge-map-0.6.0.jar b/bin/osmosis/lib/default/mapsforge-map-0.6.0.jar
deleted file mode 100644
index ed944f7..0000000
Binary files a/bin/osmosis/lib/default/mapsforge-map-0.6.0.jar and /dev/null differ
diff --git a/bin/osmosis/lib/default/mapsforge-map-reader-0.6.0.jar b/bin/osmosis/lib/default/mapsforge-map-reader-0.6.0.jar
deleted file mode 100644
index 8a34c39..0000000
Binary files a/bin/osmosis/lib/default/mapsforge-map-reader-0.6.0.jar and /dev/null differ
diff --git a/bin/osmosis/lib/default/mapsforge-map-writer-0.6.0.jar b/bin/osmosis/lib/default/mapsforge-map-writer-0.6.1-jar-with-dependencies.jar
similarity index 82%
rename from bin/osmosis/lib/default/mapsforge-map-writer-0.6.0.jar
rename to bin/osmosis/lib/default/mapsforge-map-writer-0.6.1-jar-with-dependencies.jar
index 0eb603b..06898d3 100644
Binary files a/bin/osmosis/lib/default/mapsforge-map-writer-0.6.0.jar and b/bin/osmosis/lib/default/mapsforge-map-writer-0.6.1-jar-with-dependencies.jar differ
diff --git a/bin/osmosis/lib/default/mapsforge-poi-writer-0.6.1-jar-with-dependencies.jar b/bin/osmosis/lib/default/mapsforge-poi-writer-0.6.1-jar-with-dependencies.jar
new file mode 100644
index 0000000..4d2747f
Binary files /dev/null and b/bin/osmosis/lib/default/mapsforge-poi-writer-0.6.1-jar-with-dependencies.jar differ
diff --git a/poi-mapping.xml b/poi-mapping.xml
new file mode 100644
index 0000000..27a1c96
--- /dev/null
+++ b/poi-mapping.xml
@@ -0,0 +1,1466 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<category xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" title="root"
+    xmlns="http://mapsforge.org/poi-mapping"
+    xsi:schemaLocation="http://mapsforge.org/poi-mapping https://raw.githubusercontent.com/mapsforge/mapsforge/master/resources/poi-mapping.xsd">
+
+    <!-- http://wiki.openstreetmap.org/wiki/Map_Features -->
+
+    <!-- Amenities -->
+    <category title="Amenities">
+        <category title="Food">
+            <category title="Restaurants">
+                <mapping tag="amenity=restaurant" />
+            </category>
+            <category title="Food counter areas">
+                <mapping tag="amenity=food_court" />
+            </category>
+            <category title="Fast food restaurants">
+                <mapping tag="amenity=fast_food" />
+            </category>
+            <category title="Drinking water sources">
+                <mapping tag="amenity=drinking_water" />
+            </category>
+            <category title="Public grills">
+                <mapping tag="amenity=bbq" />
+            </category>
+            <category title="Pubs">
+                <mapping tag="amenity=pub" />
+            </category>
+            <category title="Bars">
+                <mapping tag="amenity=bar" />
+            </category>
+            <category title="Cafes">
+                <mapping tag="amenity=cafe" />
+            </category>
+            <category title="Beer gardens">
+                <mapping tag="amenity=beer_garden" />
+            </category>
+            <category title="Ice cream shops">
+                <mapping tag="amenity=ice_cream" />
+                <mapping tag="shop=ice_cream" />
+            </category>
+        </category>
+        <category title="Education institutes">
+            <category title="Kindergartens">
+                <mapping tag="amenity=kindergarten" />
+            </category>
+            <category title="School grounds">
+                <mapping tag="amenity=school" />
+            </category>
+            <category title="College campus or buildings">
+                <mapping tag="amenity=college" />
+            </category>
+            <category title="Public libraries">
+                <mapping tag="amenity=library" />
+            </category>
+            <category title="University campus or buildings">
+                <mapping tag="amenity=university" />
+            </category>
+        </category>
+        <category title="Transportation">
+            <category title="Ferry terminals">
+                <mapping tag="amenity=ferry_terminal" />
+            </category>
+            <category title="Bicycle parking places">
+                <mapping tag="amenity=bicycle_parking" />
+            </category>
+            <category title="Bicycle rental stations">
+                <mapping tag="amenity=bicycle_rental" />
+            </category>
+            <category title="Bus stations">
+                <mapping tag="amenity=bus_station" />
+            </category>
+            <category title="Car rental stations">
+                <mapping tag="amenity=car_rental" />
+            </category>
+            <category title="Car sharing stations">
+                <mapping tag="amenity=car_sharing" />
+            </category>
+            <category title="Car washing stations">
+                <mapping tag="amenity=car_wash" />
+            </category>
+            <category title="Fuel stations">
+                <mapping tag="amenity=fuel" />
+            </category>
+            <!--<category title="Containers holding a mixture of salt and grit">
+                <mapping tag="amenity=grit_bin" />
+            </category>-->
+            <category title="Car parks">
+                <mapping tag="amenity=parking" />
+            </category>
+            <!--<category title="A single parking space">
+                <mapping tag="amenity=parking_space" />
+            </category>-->
+            <!--<category title="Entrances / Exits to underground parking facilities">
+                <mapping tag="amenity=parking_entrance" />
+            </category>-->
+            <category title="Taxi stands">
+                <mapping tag="amenity=taxi" />
+            </category>
+            <category title="Electric vehicle charging facilities">
+                <mapping tag="amenity=charging_station" />
+                <!-- Deprecated tag -->
+                <mapping tag="amenity=ev_charging" />
+            </category>
+        </category>
+        <category title="Financial institutes">
+            <category title="ATMs and cash points">
+                <mapping tag="amenity=atm" />
+            </category>
+            <category title="Banks">
+                <mapping tag="amenity=bank" />
+            </category>
+            <category title="Currency exchange places">
+                <mapping tag="amenity=bureau_de_change" />
+            </category>
+        </category>
+        <category title="Health care">
+            <category title="Pharmacies">
+                <mapping tag="amenity=pharmacy" />
+            </category>
+            <category title="Hospitals">
+                <mapping tag="amenity=hospital" />
+                <!-- Added -->
+                <mapping tag="amenity=clinic" />
+            </category>
+            <category title="Places to drop babies for remorse">
+                <mapping tag="amenity=baby_hatch" />
+            </category>
+            <category title="Dentists">
+                <mapping tag="amenity=dentist" />
+            </category>
+            <category title="Doctor practices">
+                <mapping tag="amenity=doctors" />
+            </category>
+            <category title="Nursing homes">
+                <mapping tag="amenity=nursing_home" />
+            </category>
+            <!-- TODO There are a lot of different social facilities -->
+            <!--<category title="Social Facilities">
+                <mapping tag="amenity=social_facility" />
+            </category>-->
+            <category title="Veterinary clinics">
+                <mapping tag="amenity=veterinary" />
+            </category>
+        </category>
+        <category title="Entertainment, arts and culture">
+            <category title="Arts centers">
+                <mapping tag="amenity=arts_centre" />
+            </category>
+            <category title="Cinemas">
+                <mapping tag="amenity=cinema" />
+            </category>
+            <category title="Community centers">
+                <mapping tag="amenity=community_centre" />
+            </category>
+            <!--<category title="Social centers">
+                <mapping tag="amenity=social_centre" /> 
+            </category>-->
+            <category title="Fountains">
+                <mapping tag="amenity=fountain" />
+            </category>
+            <category title="Nightclubs (Dancing)">
+                <mapping tag="amenity=nightclub" />
+            </category>
+            <category title="Strip clubs">
+                <mapping tag="amenity=stripclub" />
+            </category>
+            <!--<category title="TV, radio or recording studios">
+                <mapping tag="amenity=studio" />
+            </category>-->
+            <category title="Theatres and operas">
+                <mapping tag="amenity=theatre" />
+            </category>
+        </category>
+        <category title="Other amenities">
+            <category title="Public benches">
+                <mapping tag="amenity=bench" />
+            </category>
+            <!-- Why not.. -->
+            <category title="Brothels">
+                <mapping tag="amenity=brothel" />
+            </category>
+            <!--<category title="Public visible clocks">
+                <mapping tag="amenity=clock" />
+            </category>-->
+            <category title="Court houses">
+                <mapping tag="amenity=court_house" />
+            </category>
+            <category title="Crematoriums">
+                <mapping tag="amenity=crematorium" />
+            </category>
+            <category title="Embassies">
+                <mapping tag="amenity=embassy" />
+            </category>
+            <category title="Fire stations">
+                <mapping tag="amenity=fire_station" />
+            </category>
+            <category title="Grave yards">
+                <mapping tag="amenity=grave_yard" />
+            </category>
+            <category title="Hunting stands">
+                <mapping tag="amenity=hunting_stand" />
+            </category>
+            <category title="Marketplaces">
+                <mapping tag="amenity=market_place" />
+            </category>
+            <category title="Churches, mosques, temples">
+                <mapping tag="amenity=place_of_worship" />
+            </category>
+            <category title="Police stations">
+                <mapping tag="amenity=police" />
+            </category>
+            <category title="Post boxes">
+                <mapping tag="amenity=post_box" />
+            </category>
+            <category title="Post offices">
+                <mapping tag="amenity=post_office" />
+            </category>
+            <category title="Prisons (not including schools)">
+                <mapping tag="amenity=prison" />
+            </category>
+            <!-- Not enough -->
+            <!--<category title="Public buildings">
+                <mapping tag="amenity=public_building" />
+            </category>-->
+            <category title="Recycling facilities">
+                <mapping tag="amenity=recycling" />
+            </category>
+            <category title="Saunas">
+                <mapping tag="amenity=sauna" />
+            </category>
+            <!-- There are a lot of different shelter_type, how to define those ?? -->
+            <category title="Bad weather shelters">
+                <mapping tag="amenity=shelter" />
+            </category>
+            <category title="Public telephones">
+                <mapping tag="amenity=telephone" />
+            </category>
+            <category title="Public toilets">
+                <mapping tag="amenity=toilets" />
+            </category>
+            <category title="Town halls">
+                <mapping tag="amenity=townhall" />
+            </category>
+            <!-- TODO Not specific enough, have better would be vending=#### under appropriate category -->
+            <!--<category title="Vending machines">
+                <mapping tag="amenity=vending_machine" />
+            </category>-->
+            <!-- Too many nodes, no need for this, everyone is able to look for one -->
+            <!--<category title="Garbage cans">
+                <mapping tag="amenity=waste_basket" />
+            </category>-->
+            <!-- Too many nodes, no need for this, everyone is able to look for one -->
+            <!--<category title="Garbage containers">
+                <mapping tag="amenity=waste_disposal" />
+            </category>-->
+            <!-- drinking_water is enough -->
+            <!--<category title="Water places for animals">
+                <mapping tag="amenity=watering_place" />
+            </category>-->
+        </category>
+    </category>
+
+    <!-- Aerialway -->
+
+    <!-- Aeroway -->
+    <category title="Airport POIs">
+        <!-- Added start -->
+        <category title="Airports">
+            <mapping tag="aeroway=aerodrome" />
+            <mapping tag="aeroway=airport" />
+        </category>
+        <category title="Airport terminals">
+            <mapping tag="aeroway=terminal" />
+        </category>
+        <!-- Added end -->
+        <!-- Questionable, does this really add valuable information? Would effect tag-mapping too!! -->
+        <category title="Airport gates">
+            <mapping tag="aeroway=gate" />
+        </category>
+        <category title="Helipads">
+            <mapping tag="aeroway=helipad" />
+        </category>
+        <category title="Terminals">
+            <mapping tag="aeroway=terminal" />
+        </category>
+    </category>
+
+    <!-- See annotation in #736 -->
+    <!-- Barrier -->
+    <category title="Barriers">
+        <!--<category title="Kerbs">
+            <mapping tag="barrier=kerb" />
+        </category>
+        <category title="Blocks">
+            <mapping tag="barrier=block" />
+        </category>
+        <category title="Bollards">
+            <mapping tag="barrier=bollard" />
+        </category>-->
+        <category title="Border controls">
+            <mapping tag="barrier=border_control" />
+        </category>
+        <!--<category title="Cattle grids">
+            <mapping tag="barrier=cattle_grid" />
+        </category>
+        <category title="Chains">
+            <mapping tag="barrier=chain" />
+        </category>
+        <category title="Cycle barriers">
+            <mapping tag="barrier=cycle_barrier" />
+        </category>
+        <category title="Motorcycle barriers">
+            <mapping tag="barrier=motorcycle_barrier" />
+        </category>
+        <category title="Debris barriers">
+            <mapping tag="barrier=debris" />
+        </category>
+        <category title="Entrance barriers">
+            <mapping tag="barrier=entrance" />
+        </category>
+        <category title="Full-height turnstiles">
+            <mapping tag="barrier=full-height_turnstile" />
+        </category>
+        <category title="Gates">
+            <mapping tag="barrier=gate" />
+        </category>
+        <category title="Horse stiles">
+            <mapping tag="barrier=horse_stile" />
+        </category>
+        <category title="Jersey barriers">
+            <mapping tag="barrier=jersey_barrier" />
+        </category>
+        <category title="Kent carriage gap">
+            <mapping tag="barrier=kent_carriage_gap" />
+        </category>
+        <category title="Kissing gates">
+            <mapping tag="barrier=kissing_gate" />
+        </category>
+        <category title="Lift gate">
+            <mapping tag="barrier=lift_gate" />
+        </category>
+        <category title="Logs">
+            <mapping tag="barrier=log" />
+        </category>
+        <category title="Ropes">
+            <mapping tag="barrier=rope" />
+        </category>
+        <category title="Sally Ports">
+            <mapping tag="barrier=sally_port" />
+        </category>
+        <category title="Spikes">
+            <mapping tag="barrier=spike" />
+        </category>
+        <category title="Stiles">
+            <mapping tag="barrier=stile" />
+        </category>
+        <category title="Swing gates">
+            <mapping tag="barrier=swing_gate" />
+        </category>
+        <category title="Toll booths">
+            <mapping tag="barrier=toll_booth" />
+        </category>
+        <category title="Turnstiles">
+            <mapping tag="barrier=turnstile" />
+        </category>-->
+    </category>
+
+    <!-- Building -->
+
+    <!-- Craft -->
+    <category title="Crafting">
+        <category title="Agricultural engines">
+            <mapping tag="craft=agricultural_engines" />
+        </category>
+        <category title="Basket makers">
+            <mapping tag="craft=basket_maker" />
+        </category>
+        <category title="Beekeepers">
+            <mapping tag="craft=beekeeper" />
+        </category>
+        <category title="Blacksmiths">
+            <mapping tag="craft=blacksmith" />
+        </category>
+        <category title="Breweries">
+            <mapping tag="craft=brewery" />
+        </category>
+        <category title="Boat builders">
+            <mapping tag="craft=boat builders" />
+        </category>
+        <category title="Bonfires">
+            <mapping tag="craft=bonfire" />
+        </category>
+        <category title="Bookbinders">
+            <mapping tag="craft=bookbinder" />
+        </category>
+        <category title="Carpenters">
+            <mapping tag="craft=carpenter" />
+        </category>
+        <category title="Carpet layers">
+            <mapping tag="craft=carpet_layer" />
+        </category>
+        <category title="Caterers">
+            <mapping tag="craft=caterer" />
+        </category>
+        <category title="Clockmakers">
+            <mapping tag="craft=clockmaker" />
+        </category>
+        <category title="Confectioneries">
+            <mapping tag="craft=confectionery" />
+        </category>
+        <category title="Dressmakers">
+            <mapping tag="craft=dressmaker" />
+        </category>
+        <category title="Electricians">
+            <mapping tag="craft=electrician" />
+        </category>
+        <category title="Falleses">
+            <mapping tag="craft=falles" />
+        </category>
+        <category title="Gardeners">
+            <mapping tag="craft=gardener" />
+        </category>
+        <category title="Glaziers">
+            <mapping tag="craft=glaziery" />
+        </category>
+        <category title="Handicrafts">
+            <mapping tag="craft=handicraft" />
+        </category>
+        <category title="Heating, Ventilating and Air Condition">
+            <mapping tag="craft=hvac" />
+        </category>
+        <category title="Insulations">
+            <mapping tag="craft=insulation" />
+        </category>
+        <category title="Jewellers">
+            <mapping tag="craft=jeweller" />
+        </category>
+        <category title="Locksmiths">
+            <mapping tag="craft=locksmith" />
+        </category>
+        <category title="Key cutters">
+            <mapping tag="craft=key_cutter" />
+        </category>
+        <category title="Metal constructions">
+            <mapping tag="craft=metal_construction" />
+        </category>
+        <category title="Opticians">
+            <mapping tag="craft=optician" />
+        </category>
+        <category title="Painters">
+            <mapping tag="craft=painter" />
+        </category>
+        <category title="Parquet layers">
+            <mapping tag="craft=parquet_layer" />
+        </category>
+        <category title="Photographers">
+            <mapping tag="craft=photographer" />
+        </category>
+        <category title="Photographic laboratory">
+            <mapping tag="craft=photographic_laboratory" />
+        </category>
+        <category title="Plasterers">
+            <mapping tag="craft=plasterer" />
+        </category>
+        <category title="Plumbers">
+            <mapping tag="craft=plumber" />
+        </category>
+        <category title="Potteries">
+            <mapping tag="craft=pottery" />
+        </category>
+        <category title="Riggers">
+            <mapping tag="craft=rigger" />
+        </category>
+        <category title="Roofers">
+            <mapping tag="craft=roofer" />
+        </category>
+        <category title="Saddlers">
+            <mapping tag="craft=saddler" />
+        </category>
+        <category title="Sail makers">
+            <mapping tag="craft=sailmaker" />
+        </category>
+        <category title="Sawmills">
+            <mapping tag="craft=sawmill" />
+        </category>
+        <category title="Scaffolders">
+            <mapping tag="craft=scaffolder" />
+        </category>
+        <category title="Sculptors">
+            <mapping tag="craft=sculptor" />
+        </category>
+        <category title="Shoemakers">
+            <mapping tag="craft=shoemaker" />
+        </category>
+        <category title="Stand builders">
+            <mapping tag="craft=stand_builder" />
+        </category>
+        <category title="Stonemason">
+            <mapping tag="craft=stonemason" />
+        </category>
+        <category title="Sun protections">
+            <mapping tag="craft=Sun protection" />
+        </category>
+        <category title="Sweeps">
+            <mapping tag="craft=sweep" />
+        </category>
+        <category title="Tailors">
+            <mapping tag="craft=tailor" />
+        </category>
+        <category title="Tilers">
+            <mapping tag="craft=tiler" />
+        </category>
+        <category title="Tinsmiths">
+            <mapping tag="craft=tinsmith" />
+        </category>
+        <category title="Upholsterers">
+            <mapping tag="craft=upholsterer" />
+        </category>
+        <category title="Watchmakers">
+            <mapping tag="craft=watchmaker" />
+        </category>
+    </category>
+
+    <!-- Emergency -->
+    <category title="Emergency">
+        <category title="Ambulance stations">
+            <mapping tag="emergency=ambulance_station" />
+        </category>
+        <category title="Fire extinguishers">
+            <mapping tag="emergency=fire_extinguisher" />
+        </category>
+        <category title="Fire flappers">
+            <mapping tag="emergency=fire_flapper" />
+        </category>
+        <category title="Fire hoses">
+            <mapping tag="emergency=Fire hose" />
+        </category>
+        <category title="Fire hydrants">
+            <mapping tag="emergency=fire_hydrant" />
+        </category>
+        <category title="Emergency phones">
+            <mapping tag="emergency=phone" />
+        </category>
+        <category title="SES stations">
+            <mapping tag="emergency=ses_station" />
+        </category>
+        <category title="Sirens">
+            <mapping tag="emergency=siren" />
+        </category>
+    </category>
+
+    <!-- Geological -->
+    <category title="Geological">
+        <category title="Outcrops">
+            <mapping tag="geological=outcrop" />
+        </category>
+        <category title="Paleontological sites">
+            <mapping tag="geological=paleontological" />
+        </category>
+    </category>
+
+    <!-- Highway -->
+    <category title="Highway">
+        <category title="Bus stops">
+            <mapping tag="highway=bus_stop" />
+        </category>
+        <!--<category title="Crossings">
+            <mapping tag="highway=crossing" />
+        </category>-->
+        <!--<category title="Emergency access points">
+            <mapping tag="highway=emergency_access_point" />
+        </category>-->
+        <!--<category title="Fords">
+            <mapping tag="highway=ford" />
+        </category>-->
+        <!--<category title="Give ways">
+            <mapping tag="highway=give_way" />
+        </category>-->
+        <!--<category title="Mini roundabouts">
+            <mapping tag="highway=mini_roundabout" />
+        </category>-->
+        <category title="Motorway junctions">
+            <mapping tag="highway=motorway_junction" />
+        </category>
+        <!--<category title="Passing spaces">
+            <mapping tag="highway=passing_place" />
+        </category>-->
+        <category title="Rest areas">
+            <mapping tag="highway=rest_area" />
+        </category>
+        <!--<category title="Speed cameras">
+            <mapping tag="highway=speed_camera" />
+        </category>-->
+        <!--<category title="Street lamps">
+            <mapping tag="highway=street_lamp" />
+        </category>-->
+        <category title="Service stations">
+            <mapping tag="highway=services" />
+        </category>
+        <!--<category title="Stop signs">
+            <mapping tag="highway=stop" />
+        </category>-->
+        <!--<category title="Traffic signals">
+            <mapping tag="highway=traffic_signal" />
+        </category>-->
+        <!--<category title="Turning cycles">
+            <mapping tag="highway=turning_cycle" />
+        </category>-->
+    </category>
+
+    <!-- Historic -->
+    <category title="Historic">
+        <category title="Archaeological sites">
+            <mapping tag="historic=archaeological" />
+        </category>
+        <category title="Battlefields">
+            <mapping tag="historic=battlefield" />
+        </category>
+        <category title="Boundary stones">
+            <mapping tag="historic=Boundary stone" />
+        </category>
+        <category title="Castles">
+            <mapping tag="historic=castle" />
+        </category>
+        <category title="City gates">
+            <mapping tag="historic=city gate" />
+        </category>
+        <category title="Forts">
+            <mapping tag="historic=fort" />
+        </category>
+        <category title="Memorials">
+            <mapping tag="historic=memorial" />
+        </category>
+        <category title="Monuments">
+            <mapping tag="historic=monument" />
+        </category>
+        <category title="Ruins">
+            <mapping tag="historic=ruins" />
+        </category>
+        <category title="Rune stones">
+            <mapping tag="historic=runes_stone" />
+        </category>
+        <category title="Wayside crosses">
+            <mapping tag="historic=wayside_cross" />
+        </category>
+        <category title="Wayside shrines">
+            <mapping tag="historic=wayside_shrine" />
+        </category>
+        <category title="Wrecks">
+            <mapping tag="historic=wreck" />
+        </category>
+    </category>
+
+    <!-- Leisure -->
+    <category title="Leisure">
+        <!--<category title="Common">
+            <mapping tag="leisure=common" />
+        </category>-->
+        <category title="Dancing places">
+            <mapping tag="leisure=dance" />
+        </category>
+        <category title="Dog parks">
+            <mapping tag="leisure=dog_park" />
+        </category>
+        <category title="Fishing sites">
+            <mapping tag="leisure=fishing" />
+        </category>
+        <category title="Gardens">
+            <mapping tag="leisure=garden" />
+        </category>
+        <category title="Golf courses">
+            <mapping tag="leisure=golf_course" />
+        </category>
+        <category title="Ice rinks">
+            <mapping tag="leisure=ice_rink" />
+        </category>
+        <category title="Marinas">
+            <mapping tag="leisure=marina" />
+        </category>
+        <category title="Miniature golf places">
+            <mapping tag="leisure=miniature_golf" />
+        </category>
+        <category title="Nature reserves">
+            <mapping tag="leisure=nature_reserve" />
+        </category>
+        <category title="Parks">
+            <mapping tag="leisure=park" />
+        </category>
+        <category title="Pitches">
+            <mapping tag="leisure=pitch" />
+        </category>
+        <category title="Playgrounds">
+            <mapping tag="leisure=playground" />
+        </category>
+        <category title="Slipways">
+            <mapping tag="leisure=slipway" />
+        </category>
+        <category title="Sports centres">
+            <mapping tag="leisure=sports_centre" />
+        </category>
+        <category title="Stadiums">
+            <mapping tag="leisure=stadium" />
+        </category>
+        <category title="Swimming pools">
+            <mapping tag="leisure=swimming_pool" />
+        </category>
+        <category title="Tracks">
+            <mapping tag="leisure=track" />
+        </category>
+        <category title="Water parks">
+            <mapping tag="leisure=water_park" />
+        </category>
+    </category>
+
+    <!-- Man Made -->
+    <category title="Man Made">
+        <category title="Adits">
+            <mapping tag="man_made=adit" />
+        </category>
+        <category title="Beacons">
+            <mapping tag="man_made=beacon" />
+        </category>
+        <category title="Chimneys">
+            <mapping tag="man_made=chimney" />
+        </category>
+        <!--<category title="Cranes">
+            <mapping tag="man_made=crane" />
+        </category>-->
+        <!--<category title="Flagpoles">
+            <mapping tag="man_made=flagpole" />
+        </category>-->
+        <category title="Lighthouses">
+            <mapping tag="man_made=lighthouse" />
+        </category>
+        <category title="Mineshafts">
+            <mapping tag="man_made=mineshaft" />
+        </category>
+        <!--<category title="Monitoring stations">
+            <mapping tag="man_made=monitoring_station" />
+        </category>-->
+        <category title="Petroleum wells">
+            <mapping tag="man_made=petroleum_wells" />
+        </category>
+        <category title="Covered water reservoirs">
+            <mapping tag="man_made=reservoir_covered" />
+        </category>
+        <!--<category title="Storage tanks">
+            <mapping tag="man_made=storage tank" />
+        </category>-->
+        <!--<category title="Surveillance cameras">
+            <mapping tag="man_made=surveillance" />
+        </category>-->
+        <category title="Survey points">
+            <mapping tag="man_made=survey_point" />
+        </category>
+        <category title="Towers">
+            <mapping tag="man_made=tower" />
+            <!-- OpenAndroMaps specific -->
+            <mapping tag="tower=communication" />
+            <!-- OpenAndroMaps specific -->
+            <mapping tag="tower=observation" />
+        </category>
+        <category title="Wastewater plants">
+            <mapping tag="man_made=wastewater_plant" />
+        </category>
+        <category title="Watermills">
+            <mapping tag="man_made=watermill" />
+        </category>
+        <category title="Water towers">
+            <mapping tag="man_made=water_tower" />
+        </category>
+        <category title="Water works">
+            <mapping tag="man_made=water_works" />
+        </category>
+        <category title="Water well">
+            <mapping tag="man_made=water_well" />
+        </category>
+        <category title="Windmills">
+            <mapping tag="man_made=windmill" />
+            <!-- OpenAndroMaps specific -->
+            <mapping tag="tower=windmill" />
+        </category>
+        <category title="Works">
+            <mapping tag="man_made=works" />
+        </category>
+    </category>
+
+    <!-- Military -->
+    <category title="Military">
+        <category title="Military Airfields">
+            <mapping tag="military=airfields" />
+        </category>
+        <category title="Bunkers">
+            <mapping tag="military=bunker" />
+        </category>
+        <category title="Barracks">
+            <mapping tag="military=barrack" />
+        </category>
+        <category title="Dangerous Areas">
+            <mapping tag="military=danger_area" />
+        </category>
+        <category title="Naval bases">
+            <mapping tag="military=naval_base" />
+        </category>
+        <category title="Firing / bombing ranges">
+            <mapping tag="military=range" />
+        </category>
+    </category>
+
+    <!-- Natural -->
+    <category title="Natural">
+        <category title="Peak">
+            <mapping tag="natural=peak" />
+        </category>
+        <category title="Vulcano">
+            <mapping tag="natural=vulcano" />
+        </category>
+        <category title="Geyser">
+            <mapping tag="natural=geyser" />
+        </category>
+        <category title="Spring">
+            <mapping tag="natural=spring" />
+        </category>
+    </category>
+
+    <!-- Office -->
+    <category title="Office">
+        <!--<category title="Accountants">
+            <mapping tag="office=accountant" />
+        </category>-->
+        <category title="Administrative">
+            <mapping tag="office=administrative" />
+        </category>
+        <!--<category title="Architects">
+            <mapping tag="office=" />
+        </category>-->
+        <!-- See camp_site -->
+        <!--<category title="Camping">
+            <mapping tag="office=camping" />
+        </category>-->
+        <!-- Maybe later on.. -->
+        <!--<category title="Company">
+            <mapping tag="office=company" />
+        </category>-->
+        <!--<category title="Educational institutions">
+            <mapping tag="office=educational_institution" />
+        </category>-->
+        <!--<category title="Employment agencies">
+            <mapping tag="office=employment_agency" />
+        </category>-->
+        <!--<category title="Estate agents">
+            <mapping tag="office=estate_agent" />
+        </category>-->
+        <category title="Government">
+            <mapping tag="office=government" />
+        </category>
+        <!--<category title="Insurance">
+            <mapping tag="office=insurance" />
+        </category>-->
+        <!--<category title="IT">
+            <mapping tag="office=it" />
+        </category>-->
+        <!--<category title="Lawyers">
+            <mapping tag="office=lawyer" />
+        </category>-->
+        <!--<category title="Newspapers">
+            <mapping tag="office=newspaper" />
+        </category>-->
+        <!--<category title="Non-government organisations">
+            <mapping tag="office=ngo" />
+        </category>-->
+        <!--<category title="Political parties">
+            <mapping tag="office=political_party" />
+        </category>-->
+        <!--<category title="Quasi non-government organisation">
+            <mapping tag="office=quango" />
+        </category>-->
+        <!--<category title="Research">
+            <mapping tag="office=research" />
+        </category>-->
+        <!--<category title="Telecommunication">
+            <mapping tag="office=telecommunication" />
+        </category>-->
+        <category title="Travel agents">
+            <mapping tag="office=travel_agent" />
+        </category>
+    </category>
+
+    <!-- Places / added OAM -->
+    <category title="Places">
+        <category title="Cities">
+            <mapping tag="place=city" />
+        </category>
+        <category title="Towns">
+            <mapping tag="place=town" />
+            <mapping tag="place=suburb" />
+            <mapping tag="place=neighbourhood" />
+            <mapping tag="place=neighborhood" />
+        </category>
+        <category title="Villages">
+            <mapping tag="place=village" />
+        </category>
+        <category title="Hamlets">
+            <mapping tag="place=hamlet" />
+        </category>
+        <category title="Isolated dwellings">
+            <mapping tag="place=isolated_dwelling" />
+            <mapping tag="place=farm" />
+        </category>
+    </category>
+
+    <!-- Power -->
+
+    <!-- Public Transport -->
+    <category title="Public Transport">
+        <category title="Platforms">
+            <mapping tag="public_transport=platform" />
+        </category>
+        <category title="Stations">
+            <mapping tag="public_transport=station" />
+        </category>
+        <category title="Stop positions">
+            <mapping tag="public_transport=stop_position" />
+        </category>
+    </category>
+
+    <!-- Railway -->
+    <!-- TODO -->
+
+    <!-- Route -->
+
+    <!-- Shop -->
+    <!-- TODO This should be cleared up further -->
+    <category title="Shop">
+        <category title="Alcohol">
+            <mapping tag="shop=alcohol" />
+        </category>
+        <category title="Anime">
+            <mapping tag="shop=anime" />
+        </category>
+        <category title="Baby goods">
+            <mapping tag="shop=baby_goods" />
+        </category>
+        <category title="Bakeries">
+            <mapping tag="shop=bakery" />
+        </category>
+        <category title="Bathroom furnishing">
+            <mapping tag="shop=bathroom_furnishing" />
+        </category>
+        <category title="Beauty">
+            <mapping tag="shop=beauty" />
+        </category>
+        <category title="Beds">
+            <mapping tag="shop=bed" />
+        </category>
+        <category title="Beverages">
+            <mapping tag="shop=beverages" />
+        </category>
+        <category title="Bicycles">
+            <mapping tag="shop=bicycle" />
+        </category>
+        <category title="Books">
+            <mapping tag="shop=books" />
+        </category>
+        <category title="Boutiques">
+            <mapping tag="shop=boutique" />
+        </category>
+        <category title="Butchers">
+            <mapping tag="shop=butcher" />
+        </category>
+        <category title="Cars">
+            <mapping tag="shop=car" />
+        </category>
+        <category title="Car repairs">
+            <mapping tag="shop=car_repair" />
+        </category>
+        <category title="Car parts">
+            <mapping tag="shop=car_parts" />
+        </category>
+        <category title="Carpets">
+            <mapping tag="shop=carpet" />
+        </category>
+        <category title="Charity">
+            <mapping tag="shop=charity" />
+        </category>
+        <category title="Chemists">
+            <mapping tag="shop=chemist" />
+            <mapping tag="shop=drugstore" />
+        </category>
+        <category title="Clothes">
+            <mapping tag="shop=clothes" />
+        </category>
+        <category title="Computers">
+            <mapping tag="shop=computer" />
+        </category>
+        <category title="Confectionery shops">
+            <mapping tag="shop=confectionery" />
+        </category>
+        <category title="Convenience">
+            <mapping tag="shop=convenience" />
+        </category>
+        <category title="Copyshops">
+            <mapping tag="shop=copyshop" />
+        </category>
+        <category title="Curtains">
+            <mapping tag="shop=curtain" />
+        </category>
+        <category title="Delis">
+            <mapping tag="shop=deli" />
+        </category>
+        <category title="Department stores">
+            <mapping tag="shop=department_store" />
+        </category>
+        <category title="Dives">
+            <mapping tag="shop=dive" />
+        </category>
+        <category title="Dry cleaning">
+            <mapping tag="shop=dry_cleaning" />
+        </category>
+        <category title="DIY">
+            <mapping tag="shop=doityourself" />
+            <mapping tag="shop=trade" />
+        </category>
+        <category title="Electronics">
+            <mapping tag="shop=electronics" />
+        </category>
+        <category title="Erotic">
+            <mapping tag="shop=erotic" />
+        </category>
+        <category title="Fabric">
+            <mapping tag="shop=fabric" />
+        </category>
+        <category title="Farms">
+            <mapping tag="shop=farm" />
+        </category>
+        <category title="Florists">
+            <mapping tag="shop=florist" />
+        </category>
+        <category title="Frames">
+            <mapping tag="shop=frame" />
+        </category>
+        <category title="Furnaces">
+            <mapping tag="shop=furnace" />
+        </category>
+        <category title="Funeral directors">
+            <mapping tag="shop=funeral_directors" />
+        </category>
+        <category title="Furniture">
+            <mapping tag="shop=furniture" />
+        </category>
+        <category title="Garden centres">
+            <mapping tag="shop=garden_centre" />
+        </category>
+        <category title="Gas">
+            <mapping tag="shop=gas" />
+        </category>
+        <category title="General">
+            <mapping tag="shop=general" />
+        </category>
+        <category title="Gifts">
+            <mapping tag="shop=gift" />
+        </category>
+        <category title="Glazier shops">
+            <mapping tag="shop=glaziery" />
+        </category>
+        <category title="Green grocers">
+            <mapping tag="shop=greengrocer" />
+        </category>
+        <category title="Hairdressers">
+            <mapping tag="shop=hairdresser" />
+        </category>
+        <category title="Hardware">
+            <mapping tag="shop=hardware" />
+        </category>
+        <category title="Hearing aids">
+            <mapping tag="shop=hearing_aids" />
+        </category>
+        <category title="Herbalists">
+            <mapping tag="shop=herbalist" />
+        </category>
+        <category title="Hi-Fi">
+            <mapping tag="shop=hifi" />
+        </category>
+        <category title="Hunting">
+            <mapping tag="shop=hunting" />
+        </category>
+        <category title="Interior decoration">
+            <mapping tag="shop=interior_decoration" />
+        </category>
+        <category title="Jeweleries">
+            <mapping tag="shop=jewelery" />
+        </category>
+        <category title="Kiosks">
+            <mapping tag="shop=kiosk" />
+        </category>
+        <category title="Kitchens">
+            <mapping tag="shop=kitchen" />
+        </category>
+        <category title="Laundries">
+            <mapping tag="shop=laundry" />
+        </category>
+        <category title="Malls">
+            <mapping tag="shop=mall" />
+        </category>
+        <category title="Massages">
+            <mapping tag="shop=massage" />
+        </category>
+        <category title="Mobile phones">
+            <mapping tag="shop=mobile_phone" />
+        </category>
+        <category title="Money lenders">
+            <mapping tag="shop=money_lender" />
+        </category>
+        <category title="Motorcycles">
+            <mapping tag="shop=motorcycle" />
+        </category>
+        <category title="Musical instruments">
+            <mapping tag="shop=musical_instrument" />
+        </category>
+        <category title="Newsagents">
+            <mapping tag="shop=newsagent" />
+        </category>
+        <category title="Optician shops">
+            <mapping tag="shop=optician" />
+        </category>
+        <category title="Organics">
+            <mapping tag="shop=organic" />
+        </category>
+        <category title="Outdoor">
+            <mapping tag="shop=outdoor" />
+        </category>
+        <category title="Paints">
+            <mapping tag="shop=paints" />
+        </category>
+        <category title="Pawnbrokers">
+            <mapping tag="shop=pawnbroker" />
+        </category>
+        <category title="Pets">
+            <mapping tag="shop=pet" />
+        </category>
+        <category title="Radio technics">
+            <mapping tag="shop=radiotechnics" />
+        </category>
+        <category title="Seafood / Fish">
+            <mapping tag="shop=seafood" />
+            <mapping tag="shop=fish" />
+        </category>
+        <category title="Second hand">
+            <mapping tag="shop=second_hand" />
+        </category>
+        <category title="Shoes">
+            <mapping tag="shop=shoes" />
+        </category>
+        <category title="Sports">
+            <mapping tag="shop=sports" />
+        </category>
+        <category title="Stationeries">
+            <mapping tag="shop=stationery" />
+        </category>
+        <category title="Supermarkets">
+            <mapping tag="shop=supermarket" />
+        </category>
+        <category title="Tattoos">
+            <mapping tag="shop=tattoo" />
+        </category>
+        <category title="Tickets">
+            <mapping tag="shop=ticket" />
+        </category>
+        <category title="Tobacco">
+            <mapping tag="shop=tobacco" />
+        </category>
+        <category title="Toys">
+            <mapping tag="shop=toys" />
+        </category>
+        <!--<category title="Vacant">
+            <mapping tag="shop=vacant" />
+        </category>-->
+        <category title="Vacuum cleaners">
+            <mapping tag="shop=vacuum_cleaner" />
+        </category>
+        <!--<category title="Variety stores">
+            <mapping tag="shop=variety_store" />
+        </category>-->
+        <category title="Videos">
+            <mapping tag="shop=video" />
+        </category>
+        <category title="Window blinds">
+            <mapping tag="shop=window_blind" />
+        </category>
+    </category>
+
+    <!-- Sport -->
+    <category title="Sport">
+        <category title="Bowling">
+            <mapping tag="sport=9-pin" />
+            <mapping tag="sport=10-pin" />
+        </category>
+        <category title="American football">
+            <mapping tag="sport=american_football" />
+        </category>
+        <category title="Archery">
+            <mapping tag="sport=archery" />
+        </category>
+        <category title="Athletics">
+            <mapping tag="sport=athletics" />
+        </category>
+        <category title="Australian football">
+            <mapping tag="sport=australian_football" />
+        </category>
+        <category title="BASE jumping">
+            <mapping tag="sport=base" />
+        </category>
+        <category title="Badminton">
+            <mapping tag="sport=badminton" />
+        </category>
+        <category title="Baseball">
+            <mapping tag="sport=baseball" />
+        </category>
+        <category title="Basketball">
+            <mapping tag="sport=basketball" />
+        </category>
+        <category title="Beach volleyball">
+            <mapping tag="sport=beachvolleyball" />
+        </category>
+        <category title="BMX">
+            <mapping tag="sport=bmx" />
+        </category>
+        <category title="Boules">
+            <mapping tag="sport=boules" />
+        </category>
+        <category title="Bowls">
+            <mapping tag="sport=bowls" />
+        </category>
+        <category title="Canadian football">
+            <mapping tag="sport=canadian_football" />
+        </category>
+        <category title="Canoe">
+            <mapping tag="sport=canoe" />
+        </category>
+        <category title="Chess">
+            <mapping tag="sport=chess" />
+        </category>
+        <category title="Climbing">
+            <mapping tag="sport=climbing" />
+        </category>
+        <category title="Cricket">
+            <mapping tag="sport=cricket" />
+        </category>
+        <category title="Cricket nets">
+            <mapping tag="sport=cricket_nets" />
+        </category>
+        <category title="Croquet">
+            <mapping tag="sport=croquet" />
+        </category>
+        <category title="Cycling">
+            <mapping tag="sport=cycling" />
+        </category>
+        <category title="Diving">
+            <mapping tag="sport=diving" />
+        </category>
+        <category title="Dog racing">
+            <mapping tag="sport=dog_racing" />
+        </category>
+        <category title="Fencing">
+            <mapping tag="sport=fencing" />
+        </category>
+        <category title="Equestrian">
+            <mapping tag="sport=equestrian" />
+        </category>
+        <category title="Gaelic games">
+            <mapping tag="sport=gaelic_games" />
+        </category>
+        <category title="Golf">
+            <mapping tag="sport=golf" />
+        </category>
+        <category title="Gymnastics">
+            <mapping tag="sport=gymnastics" />
+        </category>
+        <category title="Hockey">
+            <mapping tag="sport=hockey" />
+        </category>
+        <category title="Horseshoes">
+            <mapping tag="sport=horseshoes" />
+        </category>
+        <category title="Horse racing">
+            <mapping tag="sport=horse_racing" />
+        </category>
+        <category title="Ice stock">
+            <mapping tag="sport=ice_stock" />
+        </category>
+        <category title="Karting">
+            <mapping tag="sport=karting" />
+        </category>
+        <category title="Korfball">
+            <mapping tag="sport=korfball" />
+        </category>
+        <category title="Motor">
+            <mapping tag="sport=motor" />
+        </category>
+        <category title="Multi">
+            <mapping tag="sport=multi" />
+        </category>
+        <category title="Orienteering">
+            <mapping tag="sport=orienteering" />
+        </category>
+        <category title="Paddle tennis">
+            <mapping tag="sport=paddle_tennis" />
+        </category>
+        <category title="Paragliding">
+            <mapping tag="sport=paragliding" />
+        </category>
+        <category title="Free flying">
+            <mapping tag="sport=free_flying" />
+        </category>
+        <category title="Pelota">
+            <mapping tag="sport=pelota" />
+        </category>
+        <category title="Racquet">
+            <mapping tag="sport=racquet" />
+        </category>
+        <category title="Rowing">
+            <mapping tag="sport=rowing" />
+        </category>
+        <category title="Rugby">
+            <mapping tag="sport=rugby_league" />
+            <mapping tag="sport=rugby_union" />
+        </category>
+        <category title="Shooting">
+            <mapping tag="sport=shooting" />
+        </category>
+        <category title="Ice skating">
+            <mapping tag="sport=skating" />
+        </category>
+        <category title="Skateboarding">
+            <mapping tag="sport=skateboard" />
+        </category>
+        <category title="Skiing">
+            <mapping tag="sport=skiing" />
+        </category>
+        <category title="Soccer">
+            <mapping tag="sport=soccer" />
+        </category>
+        <category title="Surfing">
+            <mapping tag="sport=surfing" />
+        </category>
+        <category title="Swimming">
+            <mapping tag="sport=swimming" />
+        </category>
+        <category title="Table tennis">
+            <mapping tag="sport=table_tennis" />
+        </category>
+        <category title="Handball">
+            <mapping tag="sport=team_handball" />
+        </category>
+        <category title="Tennis courts">
+            <mapping tag="sport=tennis" />
+        </category>
+        <category title="Toboggan">
+            <mapping tag="sport=toboggan" />
+        </category>
+        <category title="Volleyball">
+            <mapping tag="sport=volleyball" />
+        </category>
+        <category title="Water ski">
+            <mapping tag="sport=water_ski" />
+        </category>
+    </category>
+
+    <!-- Tourism -->
+    <category title="Tourism">
+        <category title="Alpine huts">
+            <mapping tag="tourism=alpine_hut" />
+        </category>
+        <category title="Attractions">
+            <mapping tag="tourism=attraction" />
+        </category>
+        <category title="Artworks">
+            <mapping tag="tourism=artworks" />
+        </category>
+        <category title="Camp sites">
+            <mapping tag="tourism=camp_site" />
+        </category>
+        <category title="Caravan sites">
+            <mapping tag="tourism=caravan_site" />
+        </category>
+        <category title="Water point">
+            <mapping tag="amenity=water_point" />
+        </category>
+        <category title="Chalets">
+            <mapping tag="tourism=chalet" />
+        </category>
+        <category title="Guest houses">
+            <mapping tag="tourism=guest_house" />
+        </category>
+        <category title="Hostels">
+            <mapping tag="tourism=hostel" />
+        </category>
+        <category title="Hotels">
+            <mapping tag="tourism=hotel" />
+        </category>
+        <category title="Information">
+            <mapping tag="tourism=information" />
+        </category>
+        <category title="Motels">
+            <mapping tag="tourism=motel" />
+        </category>
+        <category title="Museums">
+            <mapping tag="tourism=museum" />
+            <!-- Added -->
+            <mapping tag="amenity=museum" />
+        </category>
+        <category title="Picnic sites">
+            <mapping tag="tourism=picnic_site" />
+        </category>
+        <category title="Theme parks">
+            <mapping tag="tourism=theme park" />
+        </category>
+        <category title="Viewpoints">
+            <mapping tag="tourism=viewpoint" />
+        </category>
+        <category title="Zoos">
+            <mapping tag="tourism=zoo" />
+        </category>
+        <!--<category title="Tourism yes">
+            <mapping tag="tourism=yes" />
+        </category>-->
+    </category>
+
+    <!-- Waterway / added OAM -->
+    <category title="Waterways">
+        <category title="Rapids">
+            <mapping tag="waterway=rapids" />
+            <mapping tag="natural=rapids" />
+        </category>
+        <category title="Waterfalls">
+            <mapping tag="waterway=waterfall" />
+            <mapping tag="natural=waterfall" />
+        </category>
+        <category title="Water points">
+            <mapping tag="waterway=water_point" />
+            <mapping tag="amenity=water_point" />
+        </category>
+
+    </category>
+
+    <!-- Bicycle / added  OAM -->
+    <category title="Bicycle related">
+        <category title="Cycle parking places">
+            <mapping tag="amenity=bicycle_parking" />
+        </category>
+        <category title="Cycle rental stations">
+            <mapping tag="amenity=bicycle_rental" />
+        </category>
+        <category title="Cycle shops">
+            <mapping tag="shop=bicycle" />
+        </category>
+        <category title="Cycle vending">
+            <mapping tag="vending=bicycle_tube" />
+        </category>
+        <category title="Cycle self repair">
+            <mapping tag="amenity=bicycle_repair_station" />
+        </category>
+    </category>
+
+</category>