diff --git a/template/module/journey/map/activities.pug b/template/module/journey/map/activities.pug
index e7d9f0d..a7bb1c5 100644
--- a/template/module/journey/map/activities.pug
+++ b/template/module/journey/map/activities.pug
@@ -1,37 +1,6 @@
-l-marker(
+include mixin-marker.pug
+div(
     v-for="(place, index) in journey.leg_get().places.activities",
     :key="'activities'+index",
-    :lat-lng="place.latlon"
   )
-  l-icon(
-      v-if="place.step == journey.sel_day",
-      v-html="generate_marker(place)"
-    )
-  l-icon(
-      v-else-if="place.step == -1 || place.step == undefined",
-      v-html="generate_marker(place, 'gray')"
-    )
-  l-icon(v-else-if="edit_active", v-html="generate_marker(place, 'lightgray')")
-  l-icon(v-else)
-  l-popup
-    h1.row.text-medium.text-center {{ place.sname }}
-    span.row.text-small.text-gray {{ place.display_name }}
-    span(v-if="edit_active")
-      .row.input(style="margin-bottom:0")
-        textarea-autosize.col-12.col-sm-12.text-small(
-          placeholder="Notes",
-          v-model="place.notes",
-          :min-height="30",
-          :max-height="350"
-        )
-      a.leaflet-popup-close-button.text-gray(
-        style="right: 0px; visibility: visible",
-        href="#rm",
-        v-on:click.prevent="place.step = -1"
-      ) -
-      a.leaflet-popup-close-button.text-gray(
-        style="right: 16px; visibility: visible",
-        href="#ad",
-        v-on:click.prevent="place.step = journey.sel_day"
-      ) +
-    span.row.text-small.text-dark(v-else) {{ place.notes }}
+  +map_marker("activities", "var(--lightdark)", "var(--light)", "var(--lightlight)")
\ No newline at end of file