diff --git a/src/org/oscim/theme/InternalRenderTheme.java b/src/org/oscim/theme/InternalRenderTheme.java
index 23868e36..e42d6226 100644
--- a/src/org/oscim/theme/InternalRenderTheme.java
+++ b/src/org/oscim/theme/InternalRenderTheme.java
@@ -22,9 +22,9 @@ import java.io.InputStream;
  */
 public enum InternalRenderTheme implements Theme {
 
-	DEFAULT("/org/oscim/theme/osmarender/default.xml"),
+	DEFAULT("/org/oscim/theme/styles/default.xml"),
 
-	TRONRENDER("/org/oscim/theme/osmarender/tronrender.xml");
+	TRONRENDER("/org/oscim/theme/styles/tronrender.xml");
 
 	private final String mPath;
 
diff --git a/src/org/oscim/theme/renderinstruction/BitmapUtils.java b/src/org/oscim/theme/renderinstruction/BitmapUtils.java
index f7f49f64..7f8683d0 100644
--- a/src/org/oscim/theme/renderinstruction/BitmapUtils.java
+++ b/src/org/oscim/theme/renderinstruction/BitmapUtils.java
@@ -31,7 +31,7 @@ public final class BitmapUtils {
 
 	private static InputStream createInputStream(String src) throws FileNotFoundException {
 		if (src.startsWith(PREFIX_JAR)) {
-			String name = "/org/oscim/theme/osmarender/" + src.substring(PREFIX_JAR.length());
+			String name = "/org/oscim/theme/styles/" + src.substring(PREFIX_JAR.length());
 
 			InputStream inputStream = BitmapUtils.class.getResourceAsStream(name);
 			if (inputStream == null) {
diff --git a/src/org/oscim/theme/osmarender/default.xml b/src/org/oscim/theme/styles/default.xml
similarity index 100%
rename from src/org/oscim/theme/osmarender/default.xml
rename to src/org/oscim/theme/styles/default.xml
diff --git a/src/org/oscim/theme/osmarender/symbols/_bench.png b/src/org/oscim/theme/styles/symbols/_bench.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/_bench.png
rename to src/org/oscim/theme/styles/symbols/_bench.png
diff --git a/src/org/oscim/theme/osmarender/symbols/_cafe.png b/src/org/oscim/theme/styles/symbols/_cafe.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/_cafe.png
rename to src/org/oscim/theme/styles/symbols/_cafe.png
diff --git a/src/org/oscim/theme/osmarender/symbols/_fastfood.png b/src/org/oscim/theme/styles/symbols/_fastfood.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/_fastfood.png
rename to src/org/oscim/theme/styles/symbols/_fastfood.png
diff --git a/src/org/oscim/theme/osmarender/symbols/_pub.png b/src/org/oscim/theme/styles/symbols/_pub.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/_pub.png
rename to src/org/oscim/theme/styles/symbols/_pub.png
diff --git a/src/org/oscim/theme/osmarender/symbols/_restaurant.png b/src/org/oscim/theme/styles/symbols/_restaurant.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/_restaurant.png
rename to src/org/oscim/theme/styles/symbols/_restaurant.png
diff --git a/src/org/oscim/theme/osmarender/symbols/_school.png b/src/org/oscim/theme/styles/symbols/_school.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/_school.png
rename to src/org/oscim/theme/styles/symbols/_school.png
diff --git a/src/org/oscim/theme/osmarender/symbols/_theatre.png b/src/org/oscim/theme/styles/symbols/_theatre.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/_theatre.png
rename to src/org/oscim/theme/styles/symbols/_theatre.png
diff --git a/src/org/oscim/theme/osmarender/symbols/airport.png b/src/org/oscim/theme/styles/symbols/airport.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/airport.png
rename to src/org/oscim/theme/styles/symbols/airport.png
diff --git a/src/org/oscim/theme/osmarender/symbols/alpine_hut.png b/src/org/oscim/theme/styles/symbols/alpine_hut.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/alpine_hut.png
rename to src/org/oscim/theme/styles/symbols/alpine_hut.png
diff --git a/src/org/oscim/theme/osmarender/symbols/atm.png b/src/org/oscim/theme/styles/symbols/atm.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/atm.png
rename to src/org/oscim/theme/styles/symbols/atm.png
diff --git a/src/org/oscim/theme/osmarender/symbols/bakery.png b/src/org/oscim/theme/styles/symbols/bakery.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/bakery.png
rename to src/org/oscim/theme/styles/symbols/bakery.png
diff --git a/src/org/oscim/theme/osmarender/symbols/bank.png b/src/org/oscim/theme/styles/symbols/bank.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/bank.png
rename to src/org/oscim/theme/styles/symbols/bank.png
diff --git a/src/org/oscim/theme/osmarender/symbols/bench.png b/src/org/oscim/theme/styles/symbols/bench.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/bench.png
rename to src/org/oscim/theme/styles/symbols/bench.png
diff --git a/src/org/oscim/theme/osmarender/symbols/bicycle_rental.png b/src/org/oscim/theme/styles/symbols/bicycle_rental.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/bicycle_rental.png
rename to src/org/oscim/theme/styles/symbols/bicycle_rental.png
diff --git a/src/org/oscim/theme/osmarender/symbols/bus.png b/src/org/oscim/theme/styles/symbols/bus.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/bus.png
rename to src/org/oscim/theme/styles/symbols/bus.png
diff --git a/src/org/oscim/theme/osmarender/symbols/bus_sta.png b/src/org/oscim/theme/styles/symbols/bus_sta.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/bus_sta.png
rename to src/org/oscim/theme/styles/symbols/bus_sta.png
diff --git a/src/org/oscim/theme/osmarender/symbols/cable_car.png b/src/org/oscim/theme/styles/symbols/cable_car.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/cable_car.png
rename to src/org/oscim/theme/styles/symbols/cable_car.png
diff --git a/src/org/oscim/theme/osmarender/symbols/cafe.png b/src/org/oscim/theme/styles/symbols/cafe.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/cafe.png
rename to src/org/oscim/theme/styles/symbols/cafe.png
diff --git a/src/org/oscim/theme/osmarender/symbols/campSite.png b/src/org/oscim/theme/styles/symbols/campSite.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/campSite.png
rename to src/org/oscim/theme/styles/symbols/campSite.png
diff --git a/src/org/oscim/theme/osmarender/symbols/cave_entrance.png b/src/org/oscim/theme/styles/symbols/cave_entrance.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/cave_entrance.png
rename to src/org/oscim/theme/styles/symbols/cave_entrance.png
diff --git a/src/org/oscim/theme/osmarender/symbols/chair_lift_2.png b/src/org/oscim/theme/styles/symbols/chair_lift_2.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/chair_lift_2.png
rename to src/org/oscim/theme/styles/symbols/chair_lift_2.png
diff --git a/src/org/oscim/theme/osmarender/symbols/church.png b/src/org/oscim/theme/styles/symbols/church.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/church.png
rename to src/org/oscim/theme/styles/symbols/church.png
diff --git a/src/org/oscim/theme/osmarender/symbols/cinema.png b/src/org/oscim/theme/styles/symbols/cinema.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/cinema.png
rename to src/org/oscim/theme/styles/symbols/cinema.png
diff --git a/src/org/oscim/theme/osmarender/symbols/drinking_water.png b/src/org/oscim/theme/styles/symbols/drinking_water.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/drinking_water.png
rename to src/org/oscim/theme/styles/symbols/drinking_water.png
diff --git a/src/org/oscim/theme/osmarender/symbols/fastfood.png b/src/org/oscim/theme/styles/symbols/fastfood.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/fastfood.png
rename to src/org/oscim/theme/styles/symbols/fastfood.png
diff --git a/src/org/oscim/theme/osmarender/symbols/firebrigade.png b/src/org/oscim/theme/styles/symbols/firebrigade.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/firebrigade.png
rename to src/org/oscim/theme/styles/symbols/firebrigade.png
diff --git a/src/org/oscim/theme/osmarender/symbols/florist.png b/src/org/oscim/theme/styles/symbols/florist.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/florist.png
rename to src/org/oscim/theme/styles/symbols/florist.png
diff --git a/src/org/oscim/theme/osmarender/symbols/fountain.png b/src/org/oscim/theme/styles/symbols/fountain.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/fountain.png
rename to src/org/oscim/theme/styles/symbols/fountain.png
diff --git a/src/org/oscim/theme/osmarender/symbols/gondola.png b/src/org/oscim/theme/styles/symbols/gondola.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/gondola.png
rename to src/org/oscim/theme/styles/symbols/gondola.png
diff --git a/src/org/oscim/theme/osmarender/symbols/helipad.png b/src/org/oscim/theme/styles/symbols/helipad.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/helipad.png
rename to src/org/oscim/theme/styles/symbols/helipad.png
diff --git a/src/org/oscim/theme/osmarender/symbols/hospital.png b/src/org/oscim/theme/styles/symbols/hospital.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/hospital.png
rename to src/org/oscim/theme/styles/symbols/hospital.png
diff --git a/src/org/oscim/theme/osmarender/symbols/hostel.png b/src/org/oscim/theme/styles/symbols/hostel.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/hostel.png
rename to src/org/oscim/theme/styles/symbols/hostel.png
diff --git a/src/org/oscim/theme/osmarender/symbols/hotel.png b/src/org/oscim/theme/styles/symbols/hotel.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/hotel.png
rename to src/org/oscim/theme/styles/symbols/hotel.png
diff --git a/src/org/oscim/theme/osmarender/symbols/information.png b/src/org/oscim/theme/styles/symbols/information.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/information.png
rename to src/org/oscim/theme/styles/symbols/information.png
diff --git a/src/org/oscim/theme/osmarender/symbols/kindergarten.png b/src/org/oscim/theme/styles/symbols/kindergarten.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/kindergarten.png
rename to src/org/oscim/theme/styles/symbols/kindergarten.png
diff --git a/src/org/oscim/theme/osmarender/symbols/library.png b/src/org/oscim/theme/styles/symbols/library.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/library.png
rename to src/org/oscim/theme/styles/symbols/library.png
diff --git a/src/org/oscim/theme/osmarender/symbols/mosque.png b/src/org/oscim/theme/styles/symbols/mosque.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/mosque.png
rename to src/org/oscim/theme/styles/symbols/mosque.png
diff --git a/src/org/oscim/theme/osmarender/symbols/oneway.png b/src/org/oscim/theme/styles/symbols/oneway.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/oneway.png
rename to src/org/oscim/theme/styles/symbols/oneway.png
diff --git a/src/org/oscim/theme/osmarender/symbols/parking.png b/src/org/oscim/theme/styles/symbols/parking.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/parking.png
rename to src/org/oscim/theme/styles/symbols/parking.png
diff --git a/src/org/oscim/theme/osmarender/symbols/peak.png b/src/org/oscim/theme/styles/symbols/peak.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/peak.png
rename to src/org/oscim/theme/styles/symbols/peak.png
diff --git a/src/org/oscim/theme/osmarender/symbols/petrolStation.png b/src/org/oscim/theme/styles/symbols/petrolStation.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/petrolStation.png
rename to src/org/oscim/theme/styles/symbols/petrolStation.png
diff --git a/src/org/oscim/theme/osmarender/symbols/pharmacy.png b/src/org/oscim/theme/styles/symbols/pharmacy.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/pharmacy.png
rename to src/org/oscim/theme/styles/symbols/pharmacy.png
diff --git a/src/org/oscim/theme/osmarender/symbols/playground.png b/src/org/oscim/theme/styles/symbols/playground.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/playground.png
rename to src/org/oscim/theme/styles/symbols/playground.png
diff --git a/src/org/oscim/theme/osmarender/symbols/postbox.png b/src/org/oscim/theme/styles/symbols/postbox.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/postbox.png
rename to src/org/oscim/theme/styles/symbols/postbox.png
diff --git a/src/org/oscim/theme/osmarender/symbols/postoffice.png b/src/org/oscim/theme/styles/symbols/postoffice.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/postoffice.png
rename to src/org/oscim/theme/styles/symbols/postoffice.png
diff --git a/src/org/oscim/theme/osmarender/symbols/pub.png b/src/org/oscim/theme/styles/symbols/pub.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/pub.png
rename to src/org/oscim/theme/styles/symbols/pub.png
diff --git a/src/org/oscim/theme/osmarender/symbols/railway-crossing-small.png b/src/org/oscim/theme/styles/symbols/railway-crossing-small.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/railway-crossing-small.png
rename to src/org/oscim/theme/styles/symbols/railway-crossing-small.png
diff --git a/src/org/oscim/theme/osmarender/symbols/railway-crossing.png b/src/org/oscim/theme/styles/symbols/railway-crossing.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/railway-crossing.png
rename to src/org/oscim/theme/styles/symbols/railway-crossing.png
diff --git a/src/org/oscim/theme/osmarender/symbols/recycling.png b/src/org/oscim/theme/styles/symbols/recycling.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/recycling.png
rename to src/org/oscim/theme/styles/symbols/recycling.png
diff --git a/src/org/oscim/theme/osmarender/symbols/restaurant.png b/src/org/oscim/theme/styles/symbols/restaurant.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/restaurant.png
rename to src/org/oscim/theme/styles/symbols/restaurant.png
diff --git a/src/org/oscim/theme/osmarender/symbols/school.png b/src/org/oscim/theme/styles/symbols/school.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/school.png
rename to src/org/oscim/theme/styles/symbols/school.png
diff --git a/src/org/oscim/theme/osmarender/symbols/shelter.png b/src/org/oscim/theme/styles/symbols/shelter.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/shelter.png
rename to src/org/oscim/theme/styles/symbols/shelter.png
diff --git a/src/org/oscim/theme/osmarender/symbols/soccer-borderless.png b/src/org/oscim/theme/styles/symbols/soccer-borderless.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/soccer-borderless.png
rename to src/org/oscim/theme/styles/symbols/soccer-borderless.png
diff --git a/src/org/oscim/theme/osmarender/symbols/supermarket.png b/src/org/oscim/theme/styles/symbols/supermarket.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/supermarket.png
rename to src/org/oscim/theme/styles/symbols/supermarket.png
diff --git a/src/org/oscim/theme/osmarender/symbols/synagogue.png b/src/org/oscim/theme/styles/symbols/synagogue.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/synagogue.png
rename to src/org/oscim/theme/styles/symbols/synagogue.png
diff --git a/src/org/oscim/theme/osmarender/symbols/telephone.png b/src/org/oscim/theme/styles/symbols/telephone.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/telephone.png
rename to src/org/oscim/theme/styles/symbols/telephone.png
diff --git a/src/org/oscim/theme/osmarender/symbols/tennis.png b/src/org/oscim/theme/styles/symbols/tennis.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/tennis.png
rename to src/org/oscim/theme/styles/symbols/tennis.png
diff --git a/src/org/oscim/theme/osmarender/symbols/theatre.png b/src/org/oscim/theme/styles/symbols/theatre.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/theatre.png
rename to src/org/oscim/theme/styles/symbols/theatre.png
diff --git a/src/org/oscim/theme/osmarender/symbols/toilets.png b/src/org/oscim/theme/styles/symbols/toilets.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/toilets.png
rename to src/org/oscim/theme/styles/symbols/toilets.png
diff --git a/src/org/oscim/theme/osmarender/symbols/traffic_signal.png b/src/org/oscim/theme/styles/symbols/traffic_signal.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/traffic_signal.png
rename to src/org/oscim/theme/styles/symbols/traffic_signal.png
diff --git a/src/org/oscim/theme/osmarender/symbols/tree.png b/src/org/oscim/theme/styles/symbols/tree.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/tree.png
rename to src/org/oscim/theme/styles/symbols/tree.png
diff --git a/src/org/oscim/theme/osmarender/symbols/university.png b/src/org/oscim/theme/styles/symbols/university.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/university.png
rename to src/org/oscim/theme/styles/symbols/university.png
diff --git a/src/org/oscim/theme/osmarender/symbols/viewpoint.png b/src/org/oscim/theme/styles/symbols/viewpoint.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/viewpoint.png
rename to src/org/oscim/theme/styles/symbols/viewpoint.png
diff --git a/src/org/oscim/theme/osmarender/symbols/vulcan.png b/src/org/oscim/theme/styles/symbols/vulcan.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/vulcan.png
rename to src/org/oscim/theme/styles/symbols/vulcan.png
diff --git a/src/org/oscim/theme/osmarender/symbols/windmill.png b/src/org/oscim/theme/styles/symbols/windmill.png
similarity index 100%
rename from src/org/oscim/theme/osmarender/symbols/windmill.png
rename to src/org/oscim/theme/styles/symbols/windmill.png
diff --git a/src/org/oscim/theme/osmarender/tronrender.xml b/src/org/oscim/theme/styles/tronrender.xml
similarity index 100%
rename from src/org/oscim/theme/osmarender/tronrender.xml
rename to src/org/oscim/theme/styles/tronrender.xml