diff --git a/apps/ios/ChangeLog b/apps/ios/ChangeLog
index 43233dfdf..7952d546b 100644
--- a/apps/ios/ChangeLog
+++ b/apps/ios/ChangeLog
@@ -19,3 +19,4 @@
 0.18: Fix UTF8 conversion (check for `font` library, not `fonts`)
 0.19: Convert numeric weather values to int from BangleDumpWeather shortcut
 0.20: Add feels-like temperature data field to weather parsing from BangleDumpWeather shortcut.
+0.21: Add BangleDumpLocation shortcut, to update location data on watch without needing to use the watch's GPS, and added more app names/ ids.
diff --git a/apps/ios/README.md b/apps/ios/README.md
index 79ab1e7a1..dd96b9cd6 100644
--- a/apps/ios/README.md
+++ b/apps/ios/README.md
@@ -35,20 +35,21 @@ for now. It's just a few bucks/pounds/euro's.
 If you like to try a free app first, you can always use NRF Toolbox or
 Bluetooth BLE Device Finder to find and connect your Bangle.
 
-### Weather and Calendar
+### Weather, Calendar, and Location
 
-By using the `Shortcuts` app on your phone, you can send weather and calendar data to your watch. This works by sending a notification, which is read by the watch through ANCS. The watch then parses the notification for the data.
+By using the `Shortcuts` app on your phone, you can send weather, calendar, and location data to your watch. This works by sending a notification, which is read by the watch through ANCS. The watch then parses the notification for the data.
 
-While you may write your own shortcuts if you prefer (for example, to get weather from a different source), two are provided:
+While you may write your own shortcuts if you prefer (for example, to get weather from a different source), three are provided:
 
-- Calendar shortcut: https://www.icloud.com/shortcuts/4eac12548b4c424dbcdb1bd58cff338f
-- Weather shortcut: https://www.icloud.com/shortcuts/106c68bfac3746fe9a55761a3be8d092
+- [Calendar shortcut](https://www.icloud.com/shortcuts/4eac12548b4c424dbcdb1bd58cff338f)
+- [Weather shortcut](https://www.icloud.com/shortcuts/106c68bfac3746fe9a55761a3be8d092)
+- [Location shortcut](https://www.icloud.com/shortcuts/853c41e09a8e491f893a63b464d73ea1)
 
-The weather shortcut requires an OpenWeatherMap api key, which you can get for free from https://openweathermap.org/api. The shortcut will prompt you for this when you add it to your phone.
+Note: The shortcuts must keep the names defaulted by the shortcut in order for the watch to detect the weather, calender, or location data. If you rename it from `BangleDump...` to something else, it will no longer get the info, and just display it as a notification on the watch.
 
 These shortcuts can also be automated to run periodically, for example every hour, using the `Automation` tab in the Shortcuts app.
 
-The shortcuts will send a notification, which can be annoying. One potential workaround for this would be to create a focus mode, and have an automation:
+The shortcuts will send a notification. Even though the notification is deleted as soon as Bangle.js receives it, it can be quite annoying. One potential workaround for this would be to create a focus mode, and have an automation:
 - activate the focus mode (hiding notifications from the shortcut)
 - run the shortcut
 - deactivate the focus mode
@@ -60,4 +61,9 @@ Please file any issues on https://github.com/espruino/BangleApps/issues/new?titl
 
 ## Creator
 
-Gordon Williams
+- Gordon Williams
+
+## Contributors
+
+- RKBoss6
+- stweedo
diff --git a/apps/ios/boot.js b/apps/ios/boot.js
index 32fda1380..e3b6fa677 100644
--- a/apps/ios/boot.js
+++ b/apps/ios/boot.js
@@ -78,28 +78,56 @@ E.on('notify',msg=>{
     "com.apple.reminders": "Reminders",
     "com.apple.shortcuts": "Shortcuts",
     "com.apple.TestFlight": "TestFlight",
-    "com.apple.ScreenTimeNotifications": "ScreenTime",
+    "com.apple.ScreenTimeNotifications": "Screen Time",
     "com.apple.wifid.usernotification": "WiFi",
+    "com.apple.Maps": "Maps",
+    "com.apple.Music": "Apple Music",
+    "com.apple.AppStore": "App Store",
+    "com.apple.Preferences": "Settings",
+    "com.apple.calculator": "Calculator",
+    "com.apple.camera": "Camera",
+    "com.apple.weather": "Weather",
+    "com.apple.VoiceMemos": "Voice Memos",
+    "com.apple.News": "News",
+    "com.apple.tv": "Apple TV",
+    "com.apple.findmy": "Find My",
+    "com.apple.compass": "Compass",
+    "com.apple.measure": "Measure",
     "com.atebits.Tweetie2": "Twitter",
-    "com.burbn.instagram" : "Instagram",
+    "com.burbn.instagram": "Instagram",
     "com.facebook.Facebook": "Facebook",
     "com.facebook.Messenger": "Messenger",
-    "com.google.Chromecast" : "Google Home",
-    "com.google.Gmail" : "GMail",
-    "com.google.hangouts" : "Hangouts",
-    "com.google.ios.youtube" : "YouTube",
-    "com.hammerandchisel.discord" : "Discord",
-    "com.ifttt.ifttt" : "IFTTT",
-    "com.jumbo.app" : "Jumbo",
-    "com.linkedin.LinkedIn" : "LinkedIn",
+    "com.google.Chromecast": "Google Home",
+    "com.google.Gmail": "GMail",
+    "com.google.hangouts": "Hangouts",
+    "com.google.ios.youtube": "YouTube",
+    "com.google.ios.chrome": "Google Chrome",
+    "com.google.Maps": "Google Maps",
+    "com.google.Drive": "Google Drive",
+    "com.google.GoogleMobile": "Google",
+    "com.hammerandchisel.discord": "Discord",
+    "com.ifttt.ifttt": "IFTTT",
+    "com.jumbo.app": "Jumbo",
+    "com.linkedin.LinkedIn": "LinkedIn",
     "com.marktplaats.iphone": "Marktplaats",
-    "com.microsoft.Office.Outlook" : "Outlook Mail",
-    "com.nestlabs.jasper.release" : "Nest",
-    "com.netflix.Netflix" : "Netflix",
-    "com.reddit.Reddit" : "Reddit",
+    "com.microsoft.Office.Outlook": "Outlook Mail",
+    "com.microsoft.Office.Word": "Microsoft Word",
+    "com.microsoft.Office.Excel": "Microsoft Excel",
+    "com.microsoft.Office.Powerpoint": "Microsoft PowerPoint",
+    "com.nestlabs.jasper.release": "Nest",
+    "com.netflix.Netflix": "Netflix",
+    "com.reddit.Reddit": "Reddit",
     "com.skype.skype": "Skype",
     "com.skype.SkypeForiPad": "Skype",
     "com.spotify.client": "Spotify",
+    "com.soundcloud.TouchApp": "SoundCloud",
+    "com.disney.disneyplus": "Disney+",
+    "com.hbo.hbonow": "HBO Max",
+    "com.amazon.Amazon": "Amazon Shopping",
+    "com.amazon.AmazonVideo": "Prime Video",
+    "com.dropbox.Dropbox": "Dropbox",
+    "com.evernote.iPhone.Evernote": "Evernote",
+    "com.trello": "Trello",
     "com.storytel.iphone": "Storytel",
     "com.strava.stravaride": "Strava",
     "com.tinyspeck.chatlyio": "Slack",
@@ -110,20 +138,22 @@ E.on('notify',msg=>{
     "com.valvesoftware.Steam": "Steam",
     "com.vilcsak.bitcoin2": "Coinbase",
     "com.wordfeud.free": "WordFeud",
-    "com.yourcompany.PPClient": "PayPal",
+    "com.paypal.PPClient": "PayPal",
     "com.zhiliaoapp.musically": "TikTok",
+    "com.pinterest": "Pinterest",
+    "com.tumblr.tumblr": "Tumblr",
     "de.no26.Number26": "N26",
     "io.robbie.HomeAssistant": "Home Assistant",
     "net.superblock.Pushover": "Pushover",
     "net.weks.prowl": "Prowl",
     "net.whatsapp.WhatsApp": "WhatsApp",
-    "nl.ah.Appie": "Albert Heijn",
     "nl.postnl.TrackNTrace": "PostNL",
     "org.whispersystems.signal": "Signal",
     "ph.telegra.Telegraph": "Telegram",
-    "tv.twitch": "Twitch",
-    // could also use NRF.ancsGetAppInfo(msg.appId) here
-  };
+    "tv.twitch": "Twitch"
+};
+
+  
 
   //if (appNames[msg.appId]) msg.a
   if (msg.title === "BangleDumpCalendar") {
@@ -191,7 +221,7 @@ E.on('notify',msg=>{
         wind: d.wind,
         wdir: d.wdir,
         loc: d.loc
-    }
+    };
     // Convert string fields to numbers for iOS weather shortcut
     const numFields = ['code', 'wdir', 'temp','feels', 'hi', 'lo', 'hum', 'wind', 'uv', 'rain'];
     numFields.forEach(field => {
@@ -201,6 +231,47 @@ E.on('notify',msg=>{
     NRF.ancsAction(msg.uid, false);
     return;
   }
+  
+  if (msg.title === "BangleDumpLocation") {
+    
+    const d = JSON.parse(msg.message);
+    
+    /* Example:
+    {"lat":"2912.0744", "lon":"2333.332", "city":"Chicago"}*/
+    let locationJson = {
+        t: "location",
+        lat:d.lat,
+        lon:d.lon,
+        city:d.city
+    
+    };
+    // Convert string fields to numbers
+    const numFields = ['lat', 'lon'];
+    numFields.forEach(field => {
+      if (locationJson[field] != null) locationJson[field] = +locationJson[field];
+    });
+   
+    //load mylocation file
+    let myLocationJson = Object.assign({
+      lat: d.lat,
+      lon: d.lon,
+      location:d.city
+    }, require("Storage").readJSON("mylocation.json", true) || {});    
+    //remove notification from phone
+    NRF.ancsAction(msg.uid, false);
+    if(Math.abs(myLocationJson.lat - locationJson.lat) < 0.0001	 && Math.abs(myLocationJson.lon -locationJson.lon) < 0.0001){
+      //same location, do not write
+      return;
+    }
+    
+    myLocationJson.lon=locationJson.lon;
+    myLocationJson.lat=locationJson.lat;
+    myLocationJson.location=locationJson.city;
+    require("Storage").write("mylocation.json",myLocationJson);
+    
+
+    return;
+  }
 
   require("messages").pushMessage({
     t : msg.event,
diff --git a/apps/ios/metadata.json b/apps/ios/metadata.json
index c18fa7002..b549abb4c 100644
--- a/apps/ios/metadata.json
+++ b/apps/ios/metadata.json
@@ -1,11 +1,12 @@
 {
   "id": "ios",
   "name": "iOS Integration",
-  "version": "0.20",
-  "description": "Display/pull notifications, music, weather, and agenda from iOS devices",
+  "version": "0.21",
+  "description": "Display/pull notifications, music, weather, location, and agenda from iOS devices",
   "icon": "app.png",
   "tags": "tool,system,ios,apple,messages,notifications",
   "dependencies": {"messages":"module"},
+  "dependencies" : {"mylocation":"app" },
   "supports": ["BANGLEJS","BANGLEJS2"],
   "readme": "README.md",
   "storage": [
diff --git a/apps/powermanager/ChangeLog b/apps/powermanager/ChangeLog
index d5abdc79b..d660ed56d 100644
--- a/apps/powermanager/ChangeLog
+++ b/apps/powermanager/ChangeLog
@@ -14,3 +14,4 @@
       Log additional timestamp for trace log
 0.11: Minor code improvements
 0.12: Round monotonic percentage, rename to stable percentage/voltage
+0.13: Fix stable percentage not updating
diff --git a/apps/powermanager/boot.js b/apps/powermanager/boot.js
index 64267daa7..898b75cbc 100644
--- a/apps/powermanager/boot.js
+++ b/apps/powermanager/boot.js
@@ -3,7 +3,7 @@
     require('Storage').readJSON("powermanager.default.json", true) || {},
     require('Storage').readJSON("powermanager.json", true) || {}
   );
-  
+
   if (settings.log) {
     let logFile = require('Storage').open("powermanager.log","a");
     let def = require('Storage').readJSON("powermanager.def.json", true) || {};
@@ -12,7 +12,7 @@
     let hw = require('Storage').readJSON("powermanager.hw.json", true) || {};
     if (!hw.start) hw.start = Date.now();
     if (!hw.power) hw.power = {};
-    
+
     const saveEvery = 1000 * 60 * 5;
     const TO_WRAP = ["GPS","Compass","Barometer","HRM","LCD"];
 
@@ -28,9 +28,7 @@
         require('Storage').writeJSON("powermanager.hw.json", hw);
       }
     }
-    
-    
-    
+
     setInterval(save, saveEvery);
 
     E.on("kill", ()=>{
@@ -77,7 +75,6 @@
       })(Bangle[functionName]);
     }
 
-
     let wrapDeferred = ((o,t) => (a) => {
       if (a == eval || typeof a == "string") {
         return o.apply(this, arguments);
@@ -133,25 +130,19 @@
     handleCharging(Bangle.isCharging());
   }
 
-  var savedBatPercent=E.getBattery();
   if (settings.forceMonoPercentage){
-    var newPercent =Math.round((E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery())/6);
-    
+    var p = Math.round((E.getBattery()+E.getBattery()+E.getBattery()+E.getBattery())/4);
+    var op = E.getBattery;
     E.getBattery = function() {
-
-      if(Bangle.isCharging()){
-        if(newPercent > savedBatPercent)
-          savedBatPercent = newPercent;
-      }else{
-        if(newPercent < savedBatPercent)
-          savedBatPercent = newPercent;
-      }
-      return savedBatPercent;
-  };
+      var current = Math.round((op()+op()+op()+op())/4);
+      if (Bangle.isCharging() && current > p) p = current;
+      if (!Bangle.isCharging() && current < p) p = current;
+      return p;
+    };
   }
   
   if (settings.forceMonoVoltage){
-    var v = (NRF.getBattery()+NRF.getBattery()+NRF.getBattery()+NRF.getBattery()+NRF.getBattery()+NRF.getBattery())/6;
+    var v = (NRF.getBattery()+NRF.getBattery()+NRF.getBattery()+NRF.getBattery())/4;
     var ov = NRF.getBattery;
     NRF.getBattery = function() {
       var current = (ov()+ov()+ov()+ov())/4;
diff --git a/apps/powermanager/metadata.json b/apps/powermanager/metadata.json
index fed7e3bb3..49c77c9d8 100644
--- a/apps/powermanager/metadata.json
+++ b/apps/powermanager/metadata.json
@@ -2,7 +2,7 @@
   "id": "powermanager",
   "name": "Power Manager",
   "shortName": "Power Manager",
-  "version": "0.12",
+  "version": "0.13",
   "description": "Allow configuration of warnings for battery charging, stabilization of voltage, stabilization of battery percentage, and battery logging.",
   "icon": "app.png",
   "type": "bootloader",
diff --git a/apps/recorder/ChangeLog b/apps/recorder/ChangeLog
index f5c0803bb..8042370f9 100644
--- a/apps/recorder/ChangeLog
+++ b/apps/recorder/ChangeLog
@@ -60,4 +60,5 @@
       Lower accuracy of barometer data to ~1cm (saves about 15b/record)
 0.47: Fix 'blip' on speed map on some recordings
       Ensure Battery voltage is only stored to 0.01v
-      Add graphs for Steps+Battery
\ No newline at end of file
+      Add graphs for Steps+Battery
+0.48: Add ability to log average acceleration values
\ No newline at end of file
diff --git a/apps/recorder/README.md b/apps/recorder/README.md
index 9c283bb7e..52e598d93 100644
--- a/apps/recorder/README.md
+++ b/apps/recorder/README.md
@@ -19,6 +19,7 @@ You can record
 * **BAT** Battery percentage and voltage
 * **Steps** Steps counted by the step counter
 * **Baro** (Bangle.js 2) Using the built-in barometer to record Temperature, Pressure and Altitude
+* **Accel**  Average acceleration values in X,Y and Z
 * **Core** CoreTemp body temperature *if* you have a CoreTemp device and the https://banglejs.com/apps/?id=coretemp app installed
 
 You can then start/stop recording from the Recorder app itself (and as long as widgets are
@@ -29,12 +30,29 @@ Some apps like the [Run app](https://banglejs.com/apps/?id=run) are able to auto
 as well. They need to define a `foobar.recorder.js` file - see the `getRecorders`
 function in `lib.js` for more information.
 
-## Graphing
+## Viewing and Downloading Data
 
-You can download the information to the PC using [the App Loader](https://banglejs.com/apps/?id=recorder). Connect
-to your Bangle, then in `My Apps` click the disk icon next to the `Recorder` app to download data.
+You can download and visualize the information using [the App Loader](https://banglejs.com/apps/?id=recorder). Connect
+to your Bangle, then in `My Apps` click the disk icon next to the `Recorder` app to access the download interface.
 
-You can also view some information on the watch.
+### Interactive Web Interface
+
+The download interface provides individual track visualization with:
+
+* **Interactive Leaflet maps** - Each GPS track gets its own map using OpenStreetMap tiles
+* **Track statistics** - Distance, duration, and track points automatically calculated
+* **Start/End markers** - Green circles mark track start, red circles mark end points
+* **Interactive track points** - Click anywhere along the GPS track to see detailed data at that point
+* **Data popups** - View available data for each point (time, heart rate, altitude, speed, steps, battery, barometer - if recorded)
+* **Interactive charts** - Collapsible graphs for heart rate, battery, steps, elevation, speed, and barometer data with PNG export
+* **Download options** - KML, GPX, and CSV formats for individual tracks or all at once
+* **Settings** - Option to include/exclude entries without GPS coordinates
+* **Unit preferences** - Choose between metric, imperial, or auto-detect based on your locale
+* **Mobile responsive** - Works well on all devices
+
+### On-Watch Visualization
+
+You can also view some information on the watch:
 
 * Tap `View Tracks`
 * Tap on the Track number you're interested in, and you'll see a page with information about that track...
diff --git a/apps/recorder/interface.html b/apps/recorder/interface.html
index 63f2d0482..5b8ff0b88 100644
--- a/apps/recorder/interface.html
+++ b/apps/recorder/interface.html
@@ -1,359 +1,925 @@
-<html>
-  <head>
-    <link rel="stylesheet" href="../../css/spectre.min.css">
-  </head>
-  <body>
-    <div id="tracks"></div>
-    <div class="container" id="toastcontainer" stlye="position:fixed; bottom:8px; left:0px; right:0px; z-index: 100;"></div>
-
-    <script src="../../core/lib/interface.js"></script>
-    <script src="../../core/js/ui.js"></script>
-    <script src="../../core/js/utils.js"></script>
-    <script>
-var domTracks = document.getElementById("tracks");
-var fileCache = new Map();
-
-function filterGPSCoordinates(track) {
-  // only include data points with GPS values
-  var allowNoGPS = localStorage.getItem("recorder-allow-no-gps")=="true";
-  if (!allowNoGPS)
-    return track.filter(pt=>pt.Latitude!="" && pt.Longitude!="");
-  return track.map(pt => {
-    if (!isFinite(parseFloat(pt.Latitude))) pt.Latitude=0;
-    if (!isFinite(parseFloat(pt.Longitude))) pt.Longitude=0;
-    if (!isFinite(parseFloat(pt.Altitude))) pt.Altitude=0;
-    return pt;
-  })
-}
-
-function saveKML(track,title) {
-  // filter out coords with no GPS (or allow, but force to 0)
-  track = filterGPSCoordinates(track);
-  // Now output KML
-  var kml = `<?xml version="1.0" encoding="UTF-8"?>
-<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:gx="http://www.google.com/kml/ext/2.2">
-  <Document>
-    <Schema id="schema">
-${track[0].Heartrate!==undefined ? `<gx:SimpleArrayField name="heartrate" type="int">
-      <displayName>Heart Rate</displayName>
-    </gx:SimpleArrayField>`:``}
-${track[0].Steps!==undefined ? `<gx:SimpleArrayField name="steps" type="int">
-      <displayName>Step Count</displayName>
-    </gx:SimpleArrayField>`:``}
-${track[0].Core!==undefined ? `<gx:SimpleArrayField name="core" type="int">
-      <displayName>Core Temp</displayName>
-    </gx:SimpleArrayField>`:``}
-${track[0].Skin!==undefined ? `<gx:SimpleArrayField name="skin" type="int">
-      <displayName>Skin Temp</displayName>
-    </gx:SimpleArrayField>`:``}
-
-    </Schema>
-    <Folder>
-      <name>Tracks</name>
-      <Placemark>
-        <name>${title}</name>
-        <gx:Track>
-${track.map(pt=>`            <when>${pt.Time.toISOString()}</when>\n`).join("")}
-${track.map(pt=>`            <gx:coord>${pt.Longitude} ${pt.Latitude} ${pt.Altitude}</gx:coord>\n`).join("")}
-          <ExtendedData>
-            <SchemaData schemaUrl="#schema">
-${track[0].Heartrate!==undefined ? `<gx:SimpleArrayData name="heartrate">
-${track.map(pt=>`            <gx:value>${0|pt.Heartrate}</gx:value>\n`).join("")}
-              </gx:SimpleArrayData>`:``}
-${track[0].Steps!==undefined ? `<gx:SimpleArrayData name="steps">
-${track.map(pt=>`            <gx:value>${0|pt.Steps}</gx:value>\n`).join("")}
-              </gx:SimpleArrayData>`:``}
-${track[0].Core!==undefined ? `<gx:SimpleArrayData name="core">
-${track.map(pt=>`            <gx:value>${0|pt.Core}</gx:value>\n`).join("")}
-              </gx:SimpleArrayData>`:``}
-${track[0].Skin!==undefined ? `<gx:SimpleArrayData name="skin">
-${track.map(pt=>`            <gx:value>${0|pt.Skin}</gx:value>\n`).join("")}
-              </gx:SimpleArrayData>`:``}
-            </SchemaData>
-          </ExtendedData>
-        </gx:Track>
-      </Placemark>
-    </Folder>
-  </Document>
-</kml>`;
-  Util.saveFile(title+".kml", "application/vnd.google-earth.kml+xml", kml);
-  showToast("Download finished.", "success");
-}
-
-function saveGPX(track, title) {
-  if (!track || !track[0] || !"Time" in track[0] || !track[0].Time) {
-    showToast("Error in trackfile.", "error");
-    return;
-  }
-  // filter out coords with no GPS (or allow, but force to 0)
-  track = filterGPSCoordinates(track);
-  // Output GPX
-  var gpx = `<?xml version="1.0" encoding="UTF-8"?>
-<gpx creator="Bangle.js" version="1.1" xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
-  <metadata>
-    <time>${track[0].Time.toISOString()}</time>
-  </metadata>
-  <trk>
-    <name>${title}</name>
-    <trkseg>`;
-  let lastTime = 0;
-  track.forEach(pt=>{
-    let cadence;
-    if (pt.Steps && lastTime != 0){
-      cadence = pt.Steps * 60000 / (pt.Time.getTime() - lastTime);
-      cadence = cadence / 2; /*Convert from rpm to spm (one cycle is two steps), see https://github.com/espruino/BangleApps/pull/3068#issuecomment-1790041058*/
-    }
-    lastTime = pt.Time.getTime();
-
-    gpx += `
-      <trkpt lat="${pt.Latitude}" lon="${pt.Longitude}">
-        <ele>${pt.Altitude}</ele>
-        <time>${pt.Time.toISOString()}</time>
-        <extensions>
-            <gpxtpx:TrackPointExtension>
-                ${pt.Heartrate ? `<gpxtpx:hr>${pt.Heartrate}</gpxtpx:hr>`:``}
-                ${cadence ? `<gpxtpx:cad>${cadence}</gpxtpx:cad>`:``} ${""/*<gpxtpx:distance>...</gpxtpx:distance><gpxtpx:cad>65</gpxtpx:cad>*/}
-            </gpxtpx:TrackPointExtension>
-        </extensions>
-      </trkpt>`;
-
-  });
-  // https://www8.garmin.com/xmlschemas/TrackPointExtensionv1.xsd
-  gpx += `
-    </trkseg>
-  </trk>
-</gpx>`;
-  Util.saveFile(title+".gpx", "application/gpx+xml", gpx);
-  showToast("Download finished.", "success");
-}
-
-function saveCSV(track, title) {
-  if(!track[0]){
-    showToast(`Can't save empty csv "${title}" (no headers)`, "error");
-    return;
-  }
-  var headers = Object.keys(track[0]);
-  var csv = headers.join(",")+"\n";
-  track.forEach(t=>{
-    csv += headers.map(k=>{
-      if (t[k] instanceof Date) return t[k].toISOString();
-      return t[k];
-    }).join(",")+"\n";
-  });
-  Util.saveCSV(title, csv);
-  showToast("Download finished.", "success");
-}
-
-function trackLineToObject(headers, l) {
-  if (l===undefined) return {};
-  var t = l.trim().split(",");
-  var o = {};
-  headers.forEach((header,i) => o[header] = t[i]);
-  if (o.Time) o.Time = new Date(o.Time*1000);
-  return o;
-}
-
-function downloadTrack(filename, callback) {
-  function onData(data) {
-    var lines = data.trim().split("\n");
-    var headers = lines.shift().split(",");
-    var track = lines.map(l=>trackLineToObject(headers, l));
-    callback(track);
-  }
-
-  const data = fileCache.get(filename);
-  if (data) {
-    onData(data);
-  } else {
-    Util.showModal(`Downloading ${filename}...`);
-    Util.readStorageFile(filename, data => {
-      fileCache.set(filename, data);
-      onData(data);
-      Util.hideModal();
-    });
-  }
-}
-
-function downloadAll(trackList, cb) {
-  const tracks = trackList.slice();
-
-  const downloadOne = () => {
-    const track = tracks.pop();
-    if(!track) {
-      showToast("Finished downloading all.", "success");
-      return;
-    }
-
-    downloadTrack(
-      track.filename,
-      lines => {
-        cb(lines, `Bangle.js Track ${track.number}`);
-        downloadOne();
-      }
-    );
-  };
-
-  downloadOne();
-}
-
-function getTrackList() {
-  Util.showModal("Loading Track List...");
-  domTracks.innerHTML = "";
-  Puck.eval(`require("Storage").list(/^recorder\\.log.*\\.csv$/,{sf:1})`,files=>{
-    var trackList = [];
-    var promise = Promise.resolve();
-    /* For each file ask Bangle.js for info. Since we now start recording even
-    before we have a GPS trace, we get the Bangle to do a *quick* search for us
-    to see if it found any data first. */
-    files.forEach(filename => {
-      promise = promise.then(()=>new Promise(resolve => {
-        var trackNo = filename.match(/^recorder\.log(.*)\.csv$/)[1];
-        Util.showModal(`Loading Track ${trackNo}...`);
-        Puck.eval(`(function(fn) {
-  var f = require("Storage").open(fn,"r");
-  var headers = f.readLine().trim();
-  var data = f.readLine();
-  var lIdx = headers.split(",").indexOf("Latitude");
-  if (lIdx >= 0) {
-    var tries = 100;
-    var l = data;
-    while (l && l.split(",")[lIdx]=="" && tries++)
-      l = f.readLine();
-    if (l) data = l;
-  }
-  return {headers:headers,l:data};
-})(${JSON.stringify(filename)})`, trackInfo=>{
-          console.log(filename," => ",trackInfo);
-          if (!trackInfo || !"headers" in trackInfo) {
-            showToast("Error loading track list.", "error");
-            resolve();
-          }
-          trackInfo.headers = trackInfo.headers.split(",");
-          trackList.push({
-            filename : filename,
-            number : trackNo,
-            info : trackInfo
-          });
-          resolve();
-        });
-      }));
-    });
-    // ================================================
-    // When 'promise' completes we now have all the info in trackList
-    promise.then(() => {
-      var html = `
-      <div class="container">
-      <h2>Tracks</h2>
-      <div class="columns">\n`;
-      trackList.forEach(track => {
-        console.log("track", track);
-        var trackData = trackLineToObject(track.info.headers, track.info.l);
-        console.log("trackData", trackData);
-        html += `
-         <div class="column col-12">
-           <div class="card-header">
-             <div class="card-title h5">Track ${track.number}</div>
-             <div class="card-subtitle text-gray">${trackData.Time?trackData.Time.toLocaleDateString(undefined, { weekday: 'long', year: 'numeric', month: 'long', day: 'numeric' }):"No track data"}</div>
-           </div>
-${trackData.Latitude ? `
-           <div class="card-image">
-             <iframe
-               width="100%"
-               height="250"
-               frameborder="0" style="border:0"
-               src="https://www.google.com/maps/embed/v1/place?key=AIzaSyBxTcwrrVOh2piz7EmIs1Xn4FsRxJWeVH4&q=${trackData.Latitude},${trackData.Longitude}&zoom=10" allowfullscreen>
-             </iframe>
-           </div><div class="card-body"></div>` : `<div class="card-body">No GPS info</div>`}
-           <div class="card-footer">
-             <button class="btn btn-primary" filename="${track.filename}" trackid="${track.number}" task="downloadkml">Download KML</button>
-             <button class="btn btn-primary" filename="${track.filename}" trackid="${track.number}" task="downloadgpx">Download GPX</button>
-             <button class="btn btn-primary" filename="${track.filename}" trackid="${track.number}" task="downloadcsv">Download CSV</button>
-             <button class="btn btn-default" filename="${track.filename}" trackid="${track.number}" task="delete">Delete</button>
-           </div>
-         </div>
-        `;
-      });
-      if (trackList.length==0) {
-        html += `
-         <div class="column col-12">
-           <div class="card-header">
-             <div class="card-title h5">No tracks</div>
-             <div class="card-subtitle text-gray">No GPS tracks found</div>
-           </div>
-         </div>
-         `;
-      }
-      html += `
-        </div><!-- columns -->
-        <h2>Batch</h2>
-        <div class="form-group">
-          <button class="btn btn-primary" task="downloadkml_all">Download all KML</button>
-          <button class="btn btn-primary" task="downloadgpx_all">Download all GPX</button>
-          <button class="btn btn-primary" task="downloadcsv_all">Download all CSV</button>
-        </div>
-        <h2>Settings</h2>
-        <div class="form-group">
-          <label class="form-switch">
-            <input type="checkbox" id="settings-allow-no-gps" ${(localStorage.getItem("recorder-allow-no-gps")=="true")?"checked":""}>
-            <i class="form-icon"></i> Include GPX/KML entries even when there's no GPS info
-          </label>
-        </div>
-        </div>`;
-      domTracks.innerHTML = html;
-      document.getElementById("settings-allow-no-gps").addEventListener("change",event=>{
-        var allowNoGPS = event.target.checked;
-        localStorage.setItem("recorder-allow-no-gps", allowNoGPS);
-      });
-      Util.hideModal();
-      var buttons = domTracks.querySelectorAll("button");
-        for (var i=0;i<buttons.length;i++) {
-          buttons[i].addEventListener("click",event => {
-            var button = event.currentTarget;
-            var filename = button.getAttribute("filename");
-            var trackid = parseInt(button.getAttribute("trackid"));
-            var task = button.getAttribute("task");
-
-            if (!/_all$/.test(task) && (!filename || trackid===undefined)) return;
-
-            switch(task) {
-              case "delete":
-                Util.showModal(`Deleting ${filename}...`);
-                Util.eraseStorageFile(filename,()=>{
-                  Util.hideModal();
-                  getTrackList();
-                });
-                break;
-
-              case "downloadkml":
-                downloadTrack(filename, track => saveKML(track, `Bangle.js Track ${trackid}`));
-                break;
-              case "downloadgpx":
-                downloadTrack(filename, track => saveGPX(track, `Bangle.js Track ${trackid}`));
-                break;
-              case "downloadcsv":
-                downloadTrack(filename, track => saveCSV(track, `Bangle.js Track ${trackid}`));
-                break;
-
-              case "downloadkml_all":
-                downloadAll(trackList, saveKML);
-                break;
-              case "downloadgpx_all":
-                downloadAll(trackList, saveGPX);
-                break;
-              case "downloadcsv_all":
-                downloadAll(trackList, saveCSV);
-                break;
-            }
-          });
-        }
-      });
-  });
-}
-
-function onInit() {
-  getTrackList();
-}
-
-    </script>
-  </body>
-</html>
+<html>
+  <head>
+    <link rel="stylesheet" href="../../css/spectre.min.css">
+    <link rel="stylesheet" href="../../css/spectre-icons.min.css">
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
+    <style>
+      .leaflet-map { width: 100%; max-width: 600px; aspect-ratio: 1/1; margin: 0 auto; }
+      .chart-canvas { width: 100%; height: 100%; display: block; }
+      .chart-wrapper { position: relative; width: 100%; max-width: 600px; aspect-ratio: 1/1; margin: 0 auto 10px; }
+      .leaflet-map, .chart-container {
+        border-radius: 4px;
+        box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+      }
+      .chart-canvas { position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+      .track-stats { font-size: 0.9em; color: #666; margin-top: 10px; padding: 8px; background: #f8f9fa; border-radius: 4px; }
+      .charts-container { display: grid; grid-template-columns: 1fr; gap: 15px; margin-top: 15px; }
+      @media (min-width: 768px) { .charts-container { grid-template-columns: 1fr 1fr; } }
+      .chart-container {
+        position: relative;
+        background: #fff;
+        border-radius: 4px;
+        box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+      }
+      .chart-header {
+        padding: 12px 15px;
+        background: #f8f9fa;
+        border-bottom: 1px solid #e9ecef;
+        border-radius: 4px 4px 0 0;
+        cursor: pointer;
+        user-select: none;
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+      }
+      .chart-header:hover { background: #e9ecef; }
+      .chart-title { font-weight: 600; color: #333; margin: 0; }
+      .chart-toggle { float: right; font-size: 14px; color: #666; }
+      .chart-content { padding: 15px; }
+      .chart-content.collapsed { display: none; }
+      .chart-export { text-align: right; margin-top: 10px; }
+      .chart-export button { font-size: 0.85em; padding: 4px 8px; }
+      .no-data-message { text-align: center; color: #666; font-style: italic; padding: 20px; }
+      #track-selector { margin-bottom: 20px; }
+      .text-center { text-align: center; }
+      .accordion-header i { transition: transform 0.2s; }
+      input:checked ~ .accordion-header i { transition: transform 0.2s; }
+      .accordion { margin-bottom: 20px; }
+      .accordion-item { position: relative; }
+      .accordion-header { cursor: pointer; padding: 10px; background: #f8f9fa; border-radius: 4px; margin-bottom: 5px; }
+      .accordion-header:hover { background: #e9ecef; }
+      .accordion-body { overflow: visible; }
+      .track-content-wrapper {
+        max-height: 85vh;
+        overflow-y: auto;
+        padding: 10px;
+        border-top: 1px solid #eee;
+      }
+      .track-loading { text-align: center; padding: 20px; color: #666; }
+      html, body { height: auto; min-height: 100%; }
+      body { margin: 0; padding-bottom: 50px; }
+    </style>
+  </head>
+  <body>
+    <div id="tracks"></div>
+    <div class="container" id="toastcontainer" style="position:fixed; bottom:8px; left:0px; right:0px; z-index: 100;"></div>
+
+    <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
+    <script src="https://unpkg.com/leaflet-geometryutil@0.10.3/src/leaflet.geometryutil.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.js"></script>
+    <script src="../../core/lib/interface.js"></script>
+    <script src="../../core/js/ui.js"></script>
+    <script src="../../core/js/utils.js"></script>
+    <script>
+const domTracks = document.getElementById("tracks"),fileCache = new Map();
+let leafletMaps = {},trackCharts = {};
+function getLocalizationSettings() {
+  const userLang = navigator.language || navigator.userLanguage || 'en-US';
+  const stored = localStorage.getItem('recorder-units');
+  if (stored) return JSON.parse(stored);
+  const isMetric = !['en-US', 'en-LR', 'en-MM'].includes(userLang) && !userLang.startsWith('en-US');
+  return {speed: isMetric ? 'kmh' : 'mph', distance: isMetric ? 'km' : 'mi', temperature: isMetric ? 'celsius' : 'fahrenheit', elevation: isMetric ? 'm' : 'ft', auto: true};
+}
+
+function saveLocalizationSettings(settings) {
+  settings.auto = false;
+  localStorage.setItem('recorder-units', JSON.stringify(settings));
+}
+
+const unitConversions = {
+  speed: {
+    metric: { unit: 'km/h', label: 'Speed (km/h)', convert: v => v },
+    imperial: { unit: 'mph', label: 'Speed (mph)', convert: v => v * 0.621371 }
+  },
+  distance: {
+    metric: { unit: 'km', label: 'km', convert: v => v },
+    imperial: { unit: 'mi', label: 'miles', convert: v => v * 0.621371 }
+  },
+  temperature: {
+    metric: { unit: '°C', label: 'Temperature (°C)', convert: v => v },
+    imperial: { unit: '°F', label: 'Temperature (°F)', convert: v => (v * 9/5) + 32 }
+  },
+  elevation: {
+    metric: { unit: 'm', label: 'Elevation (m)', convert: v => v },
+    imperial: { unit: 'ft', label: 'Elevation (ft)', convert: v => v * 3.28084 }
+  }
+};
+
+function convertUnit(type, value, targetUnit = null) {
+  const settings = getLocalizationSettings();
+  const unit = targetUnit || settings[type];
+  const isImperial = (type === 'temperature' ? unit === 'fahrenheit' : unit !== settings[type] || !['kmh', 'km', 'celsius', 'm'].includes(unit));
+  const conversion = unitConversions[type][isImperial ? 'imperial' : 'metric'];
+  return {value: conversion.convert(value), unit: conversion.unit, label: conversion.label};
+}
+
+const convertSpeed = (v, t) => convertUnit('speed', v, t),
+      convertDistance = (v, t) => convertUnit('distance', v, t),
+      convertTemperature = (v, t) => convertUnit('temperature', v, t),
+      convertElevation = (v, t) => convertUnit('elevation', v, t);
+function calculateDistance(lat1, lon1, lat2, lon2) {
+  const R = 6371000, dLat = (lat2 - lat1) * Math.PI / 180, dLon = (lon2 - lon1) * Math.PI / 180;
+  const a = Math.sin(dLat/2) ** 2 + Math.cos(lat1 * Math.PI / 180) * Math.cos(lat2 * Math.PI / 180) * Math.sin(dLon/2) ** 2;
+  return R * 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+}
+function createChartContainer(chartId, title, collapsed = true) {
+  return `
+    <div class="chart-container">
+      <div class="chart-header" onclick="toggleChart('${chartId}')">
+        <div class="chart-title">${title}</div>
+        <div class="chart-toggle" id="toggle-${chartId}">${collapsed ? '▼' : '▲'}</div>
+      </div>
+      <div class="chart-content ${collapsed ? 'collapsed' : ''}" id="content-${chartId}">
+        <div class="chart-wrapper">
+          <canvas class="chart-canvas" id="canvas-${chartId}"></canvas>
+        </div>
+        <div class="chart-export">
+          <button class="btn btn-sm" onclick="exportChart('${chartId}')">Export PNG</button>
+        </div>
+      </div>
+    </div>`;
+}
+
+const toggleChart = (chartId) => {
+  const content = document.getElementById(`content-${chartId}`);
+  const toggle = document.getElementById(`toggle-${chartId}`);
+  const chartContainer = content.closest('.chart-container');
+  const trackContainer = content.closest('.accordion-item');
+  const isCollapsed = content.classList.toggle('collapsed');
+  toggle.textContent = isCollapsed ? '▼' : '▲';
+
+  // Z-index management prevents expanded charts from being hidden behind other tracks
+  // When expanding: find highest z-index and place this track above it
+  // When collapsing: reset z-index unless other charts in this track are still expanded
+  if (!isCollapsed) {
+    let maxZ = 4;
+    document.querySelectorAll('.accordion-item').forEach(item => {
+      const z = parseInt(item.style.zIndex, 10);
+      if (!isNaN(z) && z > maxZ) maxZ = z;
+    });
+    if (trackContainer) trackContainer.style.zIndex = maxZ + 1;
+    if (chartContainer) chartContainer.style.zIndex = '10';
+  } else {
+    if (chartContainer) chartContainer.style.zIndex = '';
+    if (!trackContainer.querySelector('.chart-content:not(.collapsed)')) trackContainer.style.zIndex = '';
+  }
+
+  if (!isCollapsed) {
+    const parts = chartId.split('-'), trackNumber = parts[parts.length - 1], chartType = parts.slice(0, -1).join('-');
+    if (trackCharts[trackNumber]?.[chartType]) requestAnimationFrame(() => trackCharts[trackNumber][chartType].resize());
+  }
+};
+
+const exportChart = (chartId) => {
+  const canvas = document.getElementById(`canvas-${chartId}`);
+  if (canvas) {
+    const link = document.createElement('a');
+    link.download = `chart-${chartId}.png`;
+    link.href = canvas.toDataURL('image/png');
+    link.click();
+    showToast('Chart exported successfully', 'success');
+  }
+};
+
+const chartTypes = {
+  heartrate: {
+    filter: d => (d.Heartrate && d.Heartrate !== "") || (d['BT Heartrate'] && d['BT Heartrate'] !== ""),
+    title: 'Heart Rate Over Time',
+    datasets: [
+      { key: 'Heartrate', label: 'Built-in HR (BPM)', color: '#dc3545', yAxis: 'y' },
+      { key: 'BT Heartrate', label: 'Bluetooth HR (BPM)', color: '#007bff', yAxis: 'y' }
+    ],
+    scales: { y: { title: 'Heart Rate (BPM)' } }
+  },
+  battery: {
+    filter: d => d['Battery Percentage'] !== undefined && d['Battery Percentage'] !== "",
+    title: 'Battery Level Over Time',
+    datasets: [
+      { key: 'Battery Percentage', label: 'Battery %', color: '#28a745', yAxis: 'y' },
+      { key: 'Battery Voltage', label: 'Voltage (V)', color: '#ffc107', yAxis: 'y1' }
+    ],
+    scales: { y: { min: 0, max: 100, title: 'Battery %' }, y1: { position: 'right', min: 3.0, max: 4.2, title: 'Voltage (V)', grid: false } }
+  },
+  steps: { filter: d => d.Steps !== undefined && d.Steps !== "", data: d => parseInt(d.Steps) || 0, label: 'Steps per Interval', color: '#36a2eb', title: 'Step Count Over Time', type: 'bar', cumulative: true },
+  elevation: {
+    filter: d => (d['Barometer Altitude'] !== undefined && d['Barometer Altitude'] !== "") || (d.Altitude !== undefined && d.Altitude !== ""),
+    title: 'Elevation Profile',
+    datasets: [
+      { key: 'Barometer Altitude', label: () => 'Barometer (' + convertElevation(1).unit + ')', color: '#14b8a6', yAxis: 'y', convert: convertElevation },
+      { key: 'Altitude', label: () => 'GPS (' + convertElevation(1).unit + ')', color: '#9333ea', yAxis: 'y', convert: convertElevation }
+    ],
+    scales: { y: { title: () => convertElevation(1).label } }
+  },
+  speed: { filter: d => d.Latitude && d.Longitude && d.Latitude !== "" && d.Longitude !== "", calculate: true, label: () => convertSpeed(1).label, color: '#10b981', title: 'Speed Over Time' },
+  barometer: {
+    filter: d => d['Barometer Temperature'] !== undefined || d['Barometer Pressure'] !== undefined,
+    title: 'Barometer Data Over Time',
+    datasets: [
+      { key: 'Barometer Temperature', label: () => convertTemperature(1).label, color: '#ef4444', yAxis: 'y', convert: convertTemperature },
+      { key: 'Barometer Pressure', label: 'Pressure (hPa)', color: '#3b82f6', yAxis: 'y1' }
+    ],
+    scales: { y: { title: () => convertTemperature(1).label }, y1: { position: 'right', title: 'Pressure (hPa)', grid: false } }
+  }
+};
+
+const createChart = (type, canvasId, trackData) => {
+  const config = chartTypes[type];
+  let data = trackData.filter(config.filter);
+
+  if (data.length === 0) {
+    document.getElementById(`content-${canvasId.replace('canvas-', '')}`).innerHTML = '<div class="no-data-message">No data available</div>';
+    return null;
+  }
+
+  const makeDataset = (label, data, color, opts = {}) => ({
+    label: typeof label === 'function' ? label() : label,
+    data, borderColor: color, backgroundColor: color + '20',
+    borderWidth: 2, fill: opts.fill !== false, tension: 0.1, ...opts
+  });
+
+  let datasets = [];
+  if (config.datasets) {
+    datasets = config.datasets
+      .filter(ds => data.some(pt => pt[ds.key] !== undefined && pt[ds.key] !== ""))
+      .map(ds => makeDataset(ds.label, data.map(pt => {
+        const val = parseFloat(pt[ds.key]);
+        return val ? (ds.convert ? parseFloat(ds.convert(val).value.toFixed(1)) : val) : null;
+      }), ds.color, { fill: false, yAxisID: ds.yAxis }));
+  } else if (type === 'speed') {
+    // Calculate speed from GPS coordinates
+    // Speed = distance between points / time between points
+    const speeds = [], times = [];
+    for (let i = 1; i < data.length; i++) {
+      const [prev, curr] = [data[i-1], data[i]];
+      if (prev.Time && curr.Time) {
+        const [lat1, lon1, lat2, lon2] = [prev.Latitude, prev.Longitude, curr.Latitude, curr.Longitude].map(parseFloat);
+        const distance = calculateDistance(lat1, lon1, lat2, lon2);
+        const timeSeconds = (curr.Time - prev.Time) / 1000;
+        const speedKmh = (distance / timeSeconds) * 3.6; // m/s to km/h
+        speeds.push(convertSpeed(speedKmh).value);
+        times.push(curr.Time.toLocaleTimeString());
+      }
+    }
+    datasets = [makeDataset(config.label, speeds, config.color)];
+    data = times.map(time => ({ Time: { toLocaleTimeString: () => time } }));
+  } else if (config.cumulative) {
+    let cumulative = 0;
+    const cumulativeData = data.map(point => cumulative += config.data(point));
+    datasets = [
+      makeDataset(config.label, data.map(config.data), config.color, { backgroundColor: config.color + 'A0', type: 'bar', yAxisID: 'y', fill: false }),
+      makeDataset('Cumulative Steps', cumulativeData, '#ff6384', { fill: false, type: 'line', yAxisID: 'y1' })
+    ];
+  } else {
+    datasets = [makeDataset(config.label, data.map(config.data), config.color)];
+  }
+
+  const chartConfig = {
+    type: config.type || 'line',
+    data: { labels: data.map(pt => pt.Time?.toLocaleTimeString() || ''), datasets },
+    options: {
+      responsive: true,
+      maintainAspectRatio: false,
+      animation: { duration: 300 },
+      interaction: { intersect: false, mode: 'point' },
+      plugins: {
+        title: { display: true, text: config.getTitle ? config.getTitle(data) : config.title },
+        legend: { display: true },
+        tooltip: { mode: 'nearest', intersect: false }
+      },
+      scales: {
+        x: { title: { display: true, text: 'Time' } },
+        y: { beginAtZero: type !== 'heartrate', title: { display: true, text: typeof config.label === 'function' ? config.label() : config.label || 'Value' } }
+      },
+      elements: { point: { radius: 1, hoverRadius: 3 } }
+    }
+  };
+
+  if (config.scales) {
+    Object.entries(config.scales).forEach(([axis, scale]) => {
+      chartConfig.options.scales[axis] = { ...scale };
+      if (scale.title) chartConfig.options.scales[axis].title = { display: true, text: typeof scale.title === 'function' ? scale.title() : scale.title };
+      if (scale.grid === false) chartConfig.options.scales[axis].grid = { drawOnChartArea: false };
+    });
+  }
+
+  if (config.cumulative) {
+    chartConfig.options.scales.y1 = { type: 'linear', display: true, position: 'right', beginAtZero: true, title: { display: true, text: 'Cumulative Steps' }, grid: { drawOnChartArea: false } };
+  }
+
+  return new Chart(document.getElementById(canvasId).getContext('2d'), chartConfig);
+};
+const createChartsForTrack = (trackNumber, trackData) => {
+  const chartsContainer = document.getElementById(`charts-${trackNumber}`);
+  if (!chartsContainer || !trackData.length) return;
+  const chartDefs = [
+    {type:'heartrate',id:'hr',title:'Heart Rate'},{type:'battery',id:'battery',title:'Battery Level'},
+    {type:'steps',id:'steps',title:'Step Count'},{type:'elevation',id:'elevation',title:'Elevation Profile'},
+    {type:'speed',id:'speed',title:'Speed'},{type:'barometer',id:'barometer',title:'Barometer Data'}
+  ];
+  const availableCharts = chartDefs.filter(({type}) => trackData.some(chartTypes[type].filter));
+  if (!availableCharts.length) {
+    chartsContainer.innerHTML = '<div class="no-data-message">No sensor data available for visualization</div>';
+    return;
+  }
+  chartsContainer.innerHTML = availableCharts.map(({id,title}) => createChartContainer(`${id}-${trackNumber}`, title)).join('');
+  trackCharts[trackNumber] = {};
+  requestAnimationFrame(() => {
+    availableCharts.forEach(({type,id}) => {
+      try { trackCharts[trackNumber][id] = createChart(type, `canvas-${id}-${trackNumber}`, trackData); }
+      catch (e) { console.error(`Error creating ${type} chart:`, e); }
+    });
+  });
+};
+
+const cleanupCharts = (trackNumber = null) => {
+  const destroyCharts = charts => Object.values(charts).forEach(c => c?.destroy?.());
+  if (trackNumber && trackCharts[trackNumber]) {
+    destroyCharts(trackCharts[trackNumber]);
+    delete trackCharts[trackNumber];
+  } else {
+    Object.values(trackCharts).forEach(destroyCharts);
+    trackCharts = {};
+  }
+};
+
+const hasValidGPS = pt => pt.Latitude && pt.Longitude && pt.Latitude !== "" && pt.Longitude !== "";
+function filterGPSCoordinates(track) {
+  const allowNoGPS = localStorage.getItem("recorder-allow-no-gps")=="true";
+  if (!allowNoGPS) return track.filter(hasValidGPS);
+  return track.map(pt => {
+    ['Latitude', 'Longitude', 'Altitude'].forEach(k => { if (!isFinite(parseFloat(pt[k]))) pt[k] = 0; });
+    return pt;
+  });
+}
+function saveKML(track,title) {
+  track = filterGPSCoordinates(track);
+  const fields = [
+    {key:'Heartrate', name:'heartrate', display:'Heart Rate'},
+    {key:'Steps', name:'steps', display:'Step Count'},
+    {key:'Core', name:'core', display:'Core Temp'},
+    {key:'Skin', name:'skin', display:'Skin Temp'}
+  ];
+  const hasField = f => track[0][f.key] !== undefined;
+  const kmlField = (f,type) => hasField(f) ? `<gx:${type} name="${f.name}"${type==='SimpleArrayField'?' type="int"':''}>${
+    type==='SimpleArrayField' ? `\n      <displayName>${f.display}</displayName>\n    ` :
+    track.map(pt=>`\n            <gx:value>${0|pt[f.key]}</gx:value>`).join("")+'\n              '
+  }</gx:${type}>` : '';
+
+  const kml = `<?xml version="1.0" encoding="UTF-8"?>
+<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:gx="http://www.google.com/kml/ext/2.2">
+  <Document>
+    <Schema id="schema">
+${fields.map(f=>kmlField(f,'SimpleArrayField')).join('\n')}
+    </Schema>
+    <Folder>
+      <name>Tracks</name>
+      <Placemark>
+        <name>${title}</name>
+        <gx:Track>
+${track.map(pt=>`            <when>${pt.Time.toISOString()}</when>`).join('\n')}
+${track.map(pt=>`            <gx:coord>${pt.Longitude} ${pt.Latitude} ${pt.Altitude}</gx:coord>`).join('\n')}
+          <ExtendedData>
+            <SchemaData schemaUrl="#schema">
+${fields.map(f=>kmlField(f,'SimpleArrayData')).join('\n')}
+            </SchemaData>
+          </ExtendedData>
+        </gx:Track>
+      </Placemark>
+    </Folder>
+  </Document>
+</kml>`;
+  Util.saveFile(title+".kml", "application/vnd.google-earth.kml+xml", kml);
+  showToast("Download finished.", "success");
+}
+
+function saveGPX(track, title) {
+  if (!track?.[0]?.Time) return showToast("Error in trackfile.", "error");
+  track = filterGPSCoordinates(track);
+  let lastTime = 0;
+  const gpx = `<?xml version="1.0" encoding="UTF-8"?>
+<gpx creator="Bangle.js" version="1.1" xmlns="http://www.topografix.com/GPX/1/1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd http://www.garmin.com/xmlschemas/GpxExtensions/v3 http://www.garmin.com/xmlschemas/GpxExtensionsv3.xsd http://www.garmin.com/xmlschemas/TrackPointExtension/v1 http://www.garmin.com/xmlschemas/TrackPointExtensionv1.xsd" xmlns:gpxtpx="http://www.garmin.com/xmlschemas/TrackPointExtension/v1" xmlns:gpxx="http://www.garmin.com/xmlschemas/GpxExtensions/v3">
+  <metadata><time>${track[0].Time.toISOString()}</time></metadata>
+  <trk><name>${title}</name><trkseg>${track.map(pt => {
+    // Calculate cadence (steps per minute) from step count
+    // Formula: (steps in interval * 60 seconds * 1000ms) / time elapsed in ms
+    // Simplified to: steps * 30000 / time_ms (since 60 * 1000 / 2 = 30000)
+    const cadence = pt.Steps && lastTime ? pt.Steps * 30000 / (pt.Time.getTime() - lastTime) : 0;
+    lastTime = pt.Time.getTime();
+    return `
+      <trkpt lat="${pt.Latitude}" lon="${pt.Longitude}">
+        <ele>${pt.Altitude}</ele>
+        <time>${pt.Time.toISOString()}</time>
+        <extensions><gpxtpx:TrackPointExtension>
+          ${pt.Heartrate ? `<gpxtpx:hr>${pt.Heartrate}</gpxtpx:hr>` : ''}
+          ${cadence ? `<gpxtpx:cad>${cadence}</gpxtpx:cad>` : ''}
+        </gpxtpx:TrackPointExtension></extensions>
+      </trkpt>`;
+  }).join('')}
+    </trkseg>
+  </trk>
+</gpx>`;
+  Util.saveFile(title+".gpx", "application/gpx+xml", gpx);
+  showToast("Download finished.", "success");
+}
+
+function saveCSV(track, title) {
+  if(!track[0]) return showToast(`Can't save empty csv "${title}" (no headers)`, "error");
+  const headers = Object.keys(track[0]);
+  const csv = headers.join(",") + "\n" + track.map(t =>
+    headers.map(k => t[k] instanceof Date ? t[k].toISOString() : t[k]).join(",")
+  ).join("\n");
+  Util.saveCSV(title, csv);
+  showToast("Download finished.", "success");
+}
+
+function trackLineToObject(headers, l) {
+  if (l===undefined) return {};
+  const t = l.trim().split(","), o = {};
+  headers.forEach((header,i) => o[header] = t[i]);
+  if (o.Time) o.Time = new Date(o.Time*1000);
+  return o;
+}
+
+function downloadTrack(filename, callback) {
+  function onData(data) {
+    const lines = data.trim().split("\n"), headers = lines.shift().split(",");
+    callback(lines.map(l=>trackLineToObject(headers, l)).filter(t => t.Time));
+  }
+  const data = fileCache.get(filename);
+  if (data) onData(data);
+  else {
+    Util.showModal(`Downloading ${filename}...`);
+    Util.readStorageFile(filename, data => {
+      fileCache.set(filename, data);
+      onData(data);
+      Util.hideModal();
+    });
+  }
+}
+
+function downloadAll(trackList, cb) {
+  const tracks = [...trackList];
+  const downloadOne = () => {
+    const track = tracks.pop();
+    if(!track) return showToast("Finished downloading all.", "success");
+    downloadTrack(track.filename, lines => {
+      cb(lines, `Bangle.js Track ${track.number}`);
+      downloadOne();
+    });
+  };
+  downloadOne();
+}
+
+// ========================================
+// Map Visualization
+// ========================================
+function createLeafletMap(containerId, coordinates, fullTrack) {
+  try {
+    const map = L.map(containerId, {
+      scrollWheelZoom: false,
+      zoomControl: true
+    }).setView([0, 0], 13);
+
+    L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+      attribution: 'Map data from <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a>',
+      maxZoom: 19
+    }).addTo(map);
+
+    if (coordinates && coordinates.length > 0) {
+      const polyline = L.polyline(coordinates, {
+        color: '#2563eb',
+        weight: 3,
+        opacity: 0.8,
+        interactive: false
+      }).addTo(map);
+
+      // Get start and end times from full track data
+      const startTime = fullTrack && fullTrack[0] && fullTrack[0].Time ?
+        fullTrack[0].Time.toLocaleTimeString() : '';
+      const endTime = fullTrack && fullTrack[fullTrack.length-1] && fullTrack[fullTrack.length-1].Time ?
+        fullTrack[fullTrack.length-1].Time.toLocaleTimeString() : '';
+
+      // Create clickable markers for every GPS point
+      if (fullTrack && fullTrack.length > 0) {
+        const gpsPoints = fullTrack.filter(hasValidGPS);
+        const allMarkers = []; // Track all markers for style management
+        const allIndicators = []; // Track small indicator markers
+        let activeMarkerIndex = null; // Track which marker is currently active
+
+        // Generate popup content for any point
+        const generatePopupContent = (pointData, pointIndex) => {
+          const items = [];
+          if (pointData.Time) items.push(`<strong>🕐 ${pointData.Time.toLocaleTimeString()}</strong>`);
+          if (pointData.Heartrate) items.push(`❤️ ${pointData.Heartrate} BPM`);
+          if (pointData['Barometer Altitude'] && pointData['Barometer Altitude'] !== "" && !isNaN(parseFloat(pointData['Barometer Altitude']))) {
+            const e = convertElevation(parseFloat(pointData['Barometer Altitude']));
+            items.push(`⛰️ ${e.value.toFixed(0)} ${e.unit}`);
+          } else if (pointData.Altitude) {
+            const e = convertElevation(parseFloat(pointData.Altitude));
+            items.push(`⛰️ ${e.value.toFixed(0)} ${e.unit}`);
+          }
+          if (pointIndex > 0 && gpsPoints[pointIndex-1]?.Time && pointData.Time) {
+            const prev = gpsPoints[pointIndex-1];
+            const [lat1, lon1, lat2, lon2] = [prev.Latitude, prev.Longitude, pointData.Latitude, pointData.Longitude].map(parseFloat);
+            if ([lat1, lon1, lat2, lon2].every(v => !isNaN(v))) {
+              const speedKmh = (calculateDistance(lat1, lon1, lat2, lon2) / ((pointData.Time - prev.Time) / 1000)) * 3.6;
+              const s = convertSpeed(speedKmh);
+              items.push(`🏃 ${s.value.toFixed(1)} ${s.unit}`);
+            }
+          }
+          if (pointData['Battery Percentage']) {
+            let b = `🔋 ${pointData['Battery Percentage']}%`;
+            if (pointData['Battery Voltage']) b += ` (${parseFloat(pointData['Battery Voltage']).toFixed(2)}V)`;
+            items.push(b);
+          }
+          if (pointData.Steps) {
+            const cumSteps = fullTrack.reduce((sum, pt) => pt.Time?.getTime() <= pointData.Time.getTime() ? sum + (parseInt(pt.Steps) || 0) : sum, 0);
+            items.push(`👣 ${cumSteps.toLocaleString()} total steps`);
+          }
+          if (pointData['Barometer Temperature']) {
+            const t = convertTemperature(parseFloat(pointData['Barometer Temperature']));
+            items.push(`🌡️ ${t.value.toFixed(1)} ${t.unit}`);
+          }
+          if (pointData['Barometer Pressure']) items.push(`🌀 ${parseFloat(pointData['Barometer Pressure']).toFixed(1)} hPa`);
+          return `<div style="font-size: 12px; line-height: 1.4;">${items.join('<br>')}</div>`;
+        };
+
+        gpsPoints.forEach((point, index) => {
+          const lat = parseFloat(point.Latitude);
+          const lon = parseFloat(point.Longitude);
+
+          if (!isNaN(lat) && !isNaN(lon)) {
+            const marker = L.circleMarker([lat, lon], { radius: 10, weight: 1, fillOpacity: 0.01, opacity: 0.01, color: '#2563eb', fillColor: '#2563eb' }).addTo(map);
+            const indicator = L.circleMarker([lat, lon], { radius: 3, weight: 1, fillOpacity: 0.8, opacity: 1, color: '#999', fillColor: '#999', interactive: false }).addTo(map);
+            allMarkers.push(marker);
+            allIndicators.push(indicator);
+            Object.assign(marker, { _index: index, _pointData: point });
+          }
+        });
+
+        // Map click handler for marker selection
+        // We detect clicks in two ways:
+        // 1. Clicks within 20 pixels of the GPS track line (for clicking between points)
+        // 2. Clicks within 15 pixels of a marker (for precise point selection)
+        map.on('click', e => {
+          const clickLatLng = e.latlng;
+          // Check if click is near the GPS track line (within 20 pixels)
+          const closestPointOnLine = L.GeometryUtil.closest(map, polyline.getLatLngs(), clickLatLng);
+          const nearPolyline = closestPointOnLine?.distance <= 20;
+
+          // Find closest marker to click location
+          let [closestMarker, closestIndex, closestDistance] = [null, -1, Infinity];
+          allMarkers.forEach((marker, i) => {
+            const distance = map.distance(clickLatLng, marker.getLatLng());
+            if (distance < closestDistance) [closestMarker, closestIndex, closestDistance] = [marker, i, distance];
+          });
+
+          // Convert geographic distance to pixel distance based on current zoom level
+          // Formula: Earth's circumference (40075km) * cos(latitude) / (2^(zoom+8))
+          // This gives us meters per pixel, allowing accurate click detection
+          const zoom = map.getZoom();
+          const pixelDistance = closestDistance / (40075016.686 * Math.abs(Math.cos(clickLatLng.lat * Math.PI / 180)) / Math.pow(2, zoom + 8));
+
+          const setMarkerStyle = (idx, active) => idx !== null &&
+            allMarkers[idx].setStyle({ fillOpacity: active ? 0.5 : 0.01, opacity: active ? 0.8 : 0.01, radius: active ? 12 : 10 });
+
+          if (closestMarker && (nearPolyline || pixelDistance <= 15)) {
+            if (activeMarkerIndex !== null && activeMarkerIndex !== closestIndex) setMarkerStyle(activeMarkerIndex, false);
+            setMarkerStyle(closestIndex, true);
+            activeMarkerIndex = closestIndex;
+            closestMarker.bindPopup(generatePopupContent(closestMarker._pointData, closestIndex)).openPopup();
+          } else if (activeMarkerIndex !== null) {
+            setMarkerStyle(activeMarkerIndex, false);
+            activeMarkerIndex = null;
+          }
+        });
+
+        // Handle dragging near track line
+        map.on('mousemove', e => {
+          const nearLine = L.GeometryUtil.closest(map, polyline.getLatLngs(), e.latlng)?.distance <= 20;
+          map.dragging[nearLine ? 'disable' : 'enable']();
+          map._container.style.cursor = nearLine ? 'pointer' : '';
+        }).on('mouseout', () => {
+          map.dragging.enable();
+          map._container.style.cursor = '';
+        });
+      }
+
+      // Start/end markers
+      const markerStyle = { radius: 6, color: '#fff', weight: 2, opacity: 1, fillOpacity: 0.8, bubblingMouseEvents: false };
+      const addMarker = (coord, color, text) => {
+        const marker = L.circleMarker(coord, { ...markerStyle, fillColor: color }).addTo(map).bindPopup(text);
+        marker.on('click dblclick mousedown mouseup touchstart touchend', L.DomEvent.stopPropagation);
+        return marker;
+      };
+
+      addMarker(coordinates[0], '#22c55e', startTime ? `Start - ${startTime}` : 'Start');
+      if (coordinates.length > 1) {
+        addMarker(coordinates[coordinates.length - 1], '#ef4444', endTime ? `End - ${endTime}` : 'End');
+      }
+
+      map.fitBounds(polyline.getBounds().pad(0.1));
+    }
+
+    leafletMaps[containerId] = map;
+    return map;
+  } catch (error) {
+    console.error('Error creating map:', error);
+    return null;
+  }
+}
+
+function cleanupMaps(mapId = null) {
+  const removeMaps = m => m?.remove?.();
+  if (mapId && leafletMaps[mapId]) {
+    removeMaps(leafletMaps[mapId]);
+    delete leafletMaps[mapId];
+  }
+  else {
+    Object.values(leafletMaps).forEach(removeMaps);
+    leafletMaps = {};
+  }
+}
+
+function getTrackList() {
+  Util.showModal("Loading Track List...");
+  domTracks.innerHTML = "";
+  cleanupMaps();
+  cleanupCharts();
+
+  Puck.eval(`require("Storage").list(/^recorder\\.log.*\\.csv$/,{sf:1})`,files=>{
+    let trackList = [];
+    // Use promise chain to load tracks sequentially - this prevents overwhelming the Bangle
+    // with too many concurrent requests and ensures stable Bluetooth communication
+    let promise = Promise.resolve();
+
+    files.forEach(filename => {
+      promise = promise.then(()=>new Promise(resolve => {
+        const matches = filename.match(/^recorder\.log(.*)\.csv$/);
+        const trackNo = matches ? matches[1] : '';
+        Util.showModal(`Loading Track ${trackNo}...`);
+        // This function runs on the Bangle to quickly scan for valid GPS data
+        // Many tracks start recording before GPS lock, so we search up to 100 lines
+        // to find the first coordinate for the track preview
+        Puck.eval(`(function(fn) {
+  var f = require("Storage").open(fn,"r");
+  var headers = f.readLine().trim();
+  var data = f.readLine();
+  var lIdx = headers.split(",").indexOf("Latitude");
+  if (lIdx >= 0) {
+    var tries = 100;
+    var l = data;
+    while (l && l.split(",")[lIdx]=="" && tries--)
+      l = f.readLine();
+    if (l) data = l;
+  }
+  return {headers:headers,l:data};
+})(${JSON.stringify(filename)})`, trackInfo=>{
+          if (!trackInfo || !("headers" in trackInfo)) {
+            showToast("Error loading track list.", "error");
+            resolve();
+          }
+          trackInfo.headers = trackInfo.headers.split(",");
+          trackList.push({
+            filename : filename,
+            number : trackNo,
+            info : trackInfo
+          });
+          resolve();
+        });
+      }));
+    });
+
+    promise.then(() => {
+      trackList.sort((a, b) => b.number.localeCompare(a.number));
+
+      let html = `
+      <div class="container">
+      <h2>GPS Tracks</h2>`;
+
+      if (trackList.length > 0) {
+        html += `<div class="accordion">`;
+        trackList.forEach((track, index) => {
+          const trackData = trackLineToObject(track.info.headers, track.info.l);
+          const dateStr = trackData.Time ?
+            trackData.Time.toLocaleDateString(undefined, { weekday: 'short', year: 'numeric', month: 'short', day: 'numeric' }) +
+            ' at ' + trackData.Time.toLocaleTimeString() :
+            "No date info";
+
+          html += `
+          <div class="accordion-item">
+            <input type="checkbox" id="accordion-track-${track.number}" name="accordion-tracks" hidden>
+            <label class="accordion-header" for="accordion-track-${track.number}" data-track-index="${index}">
+              <i class="icon icon-arrow-right mr-1"></i>
+              <strong>Track ${track.number}</strong> - ${dateStr}
+            </label>
+            <div class="accordion-body" id="track-content-${track.number}">
+              <div class="track-loading">Click to load track data...</div>
+            </div>
+          </div>`;
+        });
+
+        html += `</div>`;
+      }
+      if (trackList.length==0) {
+        html += `
+         <div class="column col-12">
+           <div class="card">
+             <div class="card-header">
+               <div class="card-title h5">No tracks</div>
+               <div class="card-subtitle text-gray">No GPS tracks found</div>
+             </div>
+           </div>
+         </div>`;
+      }
+
+      html += `
+        <h2>Batch Operations</h2>
+        <div class="form-group">
+          ${['KML', 'GPX', 'CSV'].map(fmt => `<button class="btn btn-primary" task="download${fmt.toLowerCase()}_all">Download all ${fmt}</button>`).join(' ')}
+        </div>
+        <h2>Settings</h2>
+        <div class="form-group">
+          <label class="form-switch">
+            <input type="checkbox" id="settings-allow-no-gps" ${localStorage.getItem("recorder-allow-no-gps")=="true" ? "checked" : ""}>
+            <i class="form-icon"></i> Include GPX/KML entries even when there's no GPS info
+          </label>
+        </div>
+        <div class="form-group">
+          <label class="form-label">Units</label>
+          <select class="form-select" id="settings-units">
+            <option value="auto">Auto-detect from locale</option>
+            <option value="metric">Metric (km/h, °C, m)</option>
+            <option value="imperial">Imperial (mph, °F, ft)</option>
+          </select>
+        </div>
+      </div>`;  // Close container div here to include everything
+
+      domTracks.innerHTML = html;
+
+      window.currentTrackList = trackList;
+      function displayTrack(trackIndex, trackNumber) {
+        const trackContainer = document.getElementById(`track-content-${trackNumber}`);
+        if (!trackContainer || trackIndex >= trackList.length) return;
+
+        if (trackContainer.dataset.loaded === 'true') return;
+        trackContainer.innerHTML = '<div class="track-loading">Loading track data...</div>';
+        const track = trackList[trackIndex];
+        const trackData = trackLineToObject(track.info.headers, track.info.l);
+        let trackHtml = `
+          <div class="track-content-wrapper">
+           <div class="card">
+             <div class="card-body">
+${trackData.Latitude ? `
+               <div id="map-${track.number}" class="leaflet-map"></div>
+               <div class="track-stats">
+                 <span id="stats-${track.number}">Loading...</span>
+               </div>` : ''}
+               <div id="charts-${track.number}" class="charts-container"></div>
+             </div>
+             <div class="card-footer">
+               <button class="btn btn-primary" filename="${track.filename}" trackid="${track.number}" task="downloadkml">Download KML</button>
+               <button class="btn btn-primary" filename="${track.filename}" trackid="${track.number}" task="downloadgpx">Download GPX</button>
+               <button class="btn btn-primary" filename="${track.filename}" trackid="${track.number}" task="downloadcsv">Download CSV</button>
+               <button class="btn btn-default" filename="${track.filename}" trackid="${track.number}" task="delete">Delete</button>
+             </div>
+           </div>
+          </div>`;
+
+        trackContainer.innerHTML = trackHtml;
+        trackContainer.dataset.loaded = 'true';
+        attachTrackButtonListeners(trackContainer);
+
+        downloadTrack(track.filename, fullTrack => {
+          if (trackData.Latitude) {
+            const coordinates = fullTrack
+              .filter(hasValidGPS)
+              .map(pt => [parseFloat(pt.Latitude), parseFloat(pt.Longitude)]);
+
+            if (coordinates.length > 0) {
+              createLeafletMap(`map-${track.number}`, coordinates, fullTrack);
+
+              let distance = 0;
+              for (let i = 1; i < coordinates.length; i++) distance += L.latLng(coordinates[i-1]).distanceTo(L.latLng(coordinates[i]));
+              const duration = fullTrack[fullTrack.length-1].Time - fullTrack[0].Time;
+              const hours = Math.floor(duration / 3600000), minutes = Math.floor((duration % 3600000) / 60000);
+              const statsEl = document.getElementById(`stats-${track.number}`);
+              if (statsEl) {
+                const d = convertDistance(distance/1000);
+                statsEl.innerHTML = `<strong>Distance:</strong> ${d.value.toFixed(2)} ${d.unit} | <strong>Duration:</strong> ${hours}h ${minutes}m | <strong>Points:</strong> ${coordinates.length}`;
+              }
+            }
+          }
+
+          createChartsForTrack(track.number, fullTrack);
+        });
+      }
+
+      function attachTrackButtonListeners(container) {
+        const buttons = container.querySelectorAll("button[task]");
+
+        buttons.forEach(button => {
+          button.addEventListener("click", event => {
+            const button = event.currentTarget;
+            const filename = button.getAttribute("filename");
+            const trackid = button.getAttribute("trackid");
+            const task = button.getAttribute("task");
+
+            if (!filename || !trackid) return;
+
+            switch(task) {
+              case "delete":
+                if (button.dataset.confirmDelete === "true") {
+                  // Second click - proceed with deletion
+                  Util.showModal(`Deleting ${filename}...`);
+                  Util.eraseStorageFile(filename, () => {
+                    Util.hideModal();
+                    getTrackList();
+                  });
+                } else {
+                  // First click - change to confirm state
+                  const originalText = button.textContent;
+                  button.textContent = "Confirm Delete";
+                  button.classList.add("btn-error");
+                  button.dataset.confirmDelete = "true";
+                  
+                  // Reset after 3 seconds
+                  setTimeout(() => {
+                    if (button.dataset.confirmDelete === "true") {
+                      button.textContent = originalText;
+                      button.classList.remove("btn-error");
+                      delete button.dataset.confirmDelete;
+                    }
+                  }, 3000);
+                }
+                break;
+              case "downloadkml":
+                downloadTrack(filename, track => saveKML(track, `Bangle.js Track ${trackid}`));
+                break;
+              case "downloadgpx":
+                downloadTrack(filename, track => saveGPX(track, `Bangle.js Track ${trackid}`));
+                break;
+              case "downloadcsv":
+                downloadTrack(filename, track => saveCSV(track, `Bangle.js Track ${trackid}`));
+                break;
+            }
+          });
+        });
+      }
+
+      if (trackList.length > 0) {
+        document.querySelectorAll('.accordion-header').forEach(header => {
+          header.addEventListener('click', e => {
+            const trackIndex = parseInt(header.dataset.trackIndex);
+            const trackNumber = trackList[trackIndex].number;
+            if (!document.getElementById(`accordion-track-${trackNumber}`).checked) {
+              setTimeout(() => displayTrack(trackIndex, trackNumber), 10);
+            }
+          });
+        });
+      }
+
+      document.getElementById("settings-allow-no-gps").addEventListener("change",event=>{
+        localStorage.setItem("recorder-allow-no-gps", event.target.checked);
+      });
+
+      const unitsSelector = document.getElementById("settings-units");
+      const currentSettings = getLocalizationSettings();
+      unitsSelector.value = currentSettings.auto ? "auto" : (currentSettings.speed === 'kmh' ? "metric" : "imperial");
+      unitsSelector.addEventListener("change", e => {
+        const val = e.target.value;
+        if (val === "auto") localStorage.removeItem("recorder-units");
+        else saveLocalizationSettings({
+          speed: val === "metric" ? 'kmh' : 'mph',
+          distance: val === "metric" ? 'km' : 'mi',
+          temperature: val === "metric" ? 'celsius' : 'fahrenheit',
+          elevation: val === "metric" ? 'm' : 'ft'
+        });
+        getTrackList();
+      });
+      Util.hideModal();
+      domTracks.querySelectorAll("button[task$='_all']").forEach(button => {
+        button.addEventListener("click", e => {
+          const task = e.currentTarget.getAttribute("task");
+          downloadAll(trackList, task.includes('kml') ? saveKML : task.includes('gpx') ? saveGPX : saveCSV);
+        });
+      });
+    });
+  });
+}
+
+function onInit() {
+  getTrackList();
+  document.addEventListener('click', e => {
+    if (e.target.tagName === 'A' && (e.target.href.includes('leafletjs.com') || e.target.href.includes('openstreetmap.org'))) {
+      e.preventDefault();
+      alert(e.target.href.includes('openstreetmap.org') ?
+        'Map data from OpenStreetMap\nLicense: Open Database License (ODbL)\nWebsite: openstreetmap.org/copyright' :
+        'Leaflet © Volodymyr Agafonkin\nLicense: BSD 2-Clause\nWebsite: leafletjs.com');
+    }
+  }, true);
+}
+
+    </script>
+  </body>
+</html>
diff --git a/apps/recorder/lib.js b/apps/recorder/lib.js
index b0f05ead4..6d17c3942 100644
--- a/apps/recorder/lib.js
+++ b/apps/recorder/lib.js
@@ -114,6 +114,28 @@ exports.getRecorders = function() {
         stop : () => {},
         draw : (x,y) => g.reset().drawImage(atob("DAwBAAMMeeeeeeeecOMMAAMMMMAA"),x,y)
       };
+    },
+    accel:function() {
+      var ax=0,ay=0,az=0,n=0;
+      function onAccel(a) {
+        ax += a.x;
+        ay += a.y;
+        az += a.z;
+        n++;
+      }
+      return {
+        name : "Accel",
+        fields : ["Accel X", "Accel Y", "Accel Z"],
+        getValues : () => {
+          if (n<1) n=1;
+          var r = [(ax/n).toFixed(2), (ay/n).toFixed(2), (az/n).toFixed(2)];
+          n = ax = ay = az = 0;
+          return r;
+        },
+        start : () => { Bangle.on('accel', onAccel); },
+        stop : () => { Bangle.removeListener('accel', onAccel); },
+        draw : (x,y) => g.reset().drawImage(atob("DAwBAAMMeeeeeeeecOMMAAMMMMAA"),x,y)
+      };
     }
   };
   if (Bangle.getPressure){
diff --git a/apps/recorder/metadata.json b/apps/recorder/metadata.json
index 2d7e54bdd..7d8251a6c 100644
--- a/apps/recorder/metadata.json
+++ b/apps/recorder/metadata.json
@@ -2,7 +2,7 @@
   "id": "recorder",
   "name": "Recorder",
   "shortName": "Recorder",
-  "version": "0.47",
+  "version": "0.48",
   "description": "Record GPS position, heart rate and more in the background, then download to your PC.",
   "icon": "app.png",
   "tags": "tool,outdoors,gps,widget,clkinfo",