diff --git a/assets/bike/broken_pump.svg b/assets/bike/broken_pump.svg
deleted file mode 100644
index 38868a5..0000000
--- a/assets/bike/broken_pump.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-
diff --git a/assets/bike/broken_pump_2.svg b/assets/bike/broken_pump_2.svg
deleted file mode 100644
index 72d4719..0000000
--- a/assets/bike/broken_pump_2.svg
+++ /dev/null
@@ -1,219 +0,0 @@
-
-
diff --git a/assets/bike/ghost.svg b/assets/bike/ghost.svg
deleted file mode 100644
index 93a4b2a..0000000
--- a/assets/bike/ghost.svg
+++ /dev/null
@@ -1,44 +0,0 @@
-
diff --git a/assets/bike/parking.svg b/assets/bike/parking.svg
deleted file mode 100644
index ee2fb72..0000000
--- a/assets/bike/parking.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-
diff --git a/assets/bike/parking_handlebar_holder.svg b/assets/bike/parking_handlebar_holder.svg
deleted file mode 100644
index 0828539..0000000
--- a/assets/bike/parking_handlebar_holder.svg
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
diff --git a/assets/bike/parking_old.svg b/assets/bike/parking_old.svg
deleted file mode 100644
index b095bc1..0000000
--- a/assets/bike/parking_old.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-
diff --git a/assets/bike/parking_rack.svg b/assets/bike/parking_rack.svg
deleted file mode 100644
index 2af4249..0000000
--- a/assets/bike/parking_rack.svg
+++ /dev/null
@@ -1,296 +0,0 @@
-
-
-
diff --git a/assets/bike/parking_shed.svg b/assets/bike/parking_shed.svg
deleted file mode 100644
index 7732398..0000000
--- a/assets/bike/parking_shed.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-
-
-
diff --git a/assets/bike/parking_staple.svg b/assets/bike/parking_staple.svg
deleted file mode 100644
index a79c0b2..0000000
--- a/assets/bike/parking_staple.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
diff --git a/assets/bike/parking_two_tier.svg b/assets/bike/parking_two_tier.svg
deleted file mode 100644
index f944d0f..0000000
--- a/assets/bike/parking_two_tier.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-
-
-
diff --git a/assets/bike/parking_wall_loops.svg b/assets/bike/parking_wall_loops.svg
deleted file mode 100644
index e512b36..0000000
--- a/assets/bike/parking_wall_loops.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-
-
-
diff --git a/assets/bike/pump.svg b/assets/bike/pump.svg
deleted file mode 100644
index 79274d2..0000000
--- a/assets/bike/pump.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-
diff --git a/assets/bike/repair_station.svg b/assets/bike/repair_station.svg
deleted file mode 100644
index 1166e8d..0000000
--- a/assets/bike/repair_station.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-
diff --git a/assets/bike/repair_station_pump.svg b/assets/bike/repair_station_pump.svg
deleted file mode 100644
index b8e3895..0000000
--- a/assets/bike/repair_station_pump.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-
diff --git a/assets/layers/cycling_themed_object/cycling_themed_objects.json b/assets/layers/cycling_themed_object/cycling_themed_objects.json
new file mode 100644
index 0000000..f0a23d3
--- /dev/null
+++ b/assets/layers/cycling_themed_object/cycling_themed_objects.json
@@ -0,0 +1,68 @@
+{
+ "id": "bike_cafes",
+ "name": {
+ "en": "Bike related object",
+ "nl": "Fietsgerelateerd object",
+ "fr": "Objet cycliste"
+ },
+ "minzoom": 12,
+ "overpassTags": "theme~cycling|bicycle",
+ "title": {
+ "render": {
+ "en": "Bike related object",
+ "nl": "Fietsgerelateerd object",
+ "fr": "Objet cycliste"
+ },
+ "mappings": [
+ {
+ "if": "name~*",
+ "then": {
+ "en": "{name}",
+ "nl": "{name}",
+ "fr": "{name}",
+ "gl": "{name}"
+ }
+ }
+ ]
+ },
+ "description": {},
+ "tagRenderings": [
+ {
+ "render": "{website}"
+ },
+ {
+ "render": "{phone}"
+ },
+ {
+ "render": "{email}"
+ }
+ ],
+ "hideUnderlayingFeaturesMinPercentage": 0,
+ "icon": {
+ "render": "./assets/layers/bike_cafe/bike_cafe.svg"
+ },
+ "width": {
+ "render": "2"
+ },
+ "iconSize": {
+ "render": "50,50,bottom"
+ },
+ "color": {
+ "render": "#694E2D"
+ },
+ "presets": [
+ {
+ "title": {
+ "en": "Bike cafe",
+ "nl": "Fietscafé",
+ "fr": "Café Vélo",
+ "gl": "Café de ciclistas"
+ },
+ "tags": [
+ "amenity=pub",
+ "pub=cycling"
+ ]
+ }
+ ],
+ "wayHandling": 2
+}
\ No newline at end of file
diff --git a/assets/layers/cycling_themed_object/other_services.svg b/assets/layers/cycling_themed_object/other_services.svg
new file mode 100644
index 0000000..2cec6d1
--- /dev/null
+++ b/assets/layers/cycling_themed_object/other_services.svg
@@ -0,0 +1,5 @@
+