diff --git a/apps/alarm/ChangeLog b/apps/alarm/ChangeLog
index 906169a04..e3b69e76e 100644
--- a/apps/alarm/ChangeLog
+++ b/apps/alarm/ChangeLog
@@ -20,3 +20,4 @@
 0.19: Ensure rescheduled alarms that already fired have 'last' reset
 0.20: Use the new 'sched' factories to initialize new alarms/timers
 0.21: Fix time reset after a day of week change (#1676)
+0.22: Refactor some methods to scheduling library
\ No newline at end of file
diff --git a/apps/alarm/app.js b/apps/alarm/app.js
index e895f9041..15a4c3774 100644
--- a/apps/alarm/app.js
+++ b/apps/alarm/app.js
@@ -4,23 +4,6 @@ Bangle.drawWidgets();
 // An array of alarm objects (see sched/README.md)
 let alarms = require("sched").getAlarms();
 
-// time in ms -> { hrs, mins }
-function decodeTime(t) {
-  t = 0 | t; // sanitise
-  let hrs = 0 | (t / 3600000);
-  return { hrs: hrs, mins: Math.round((t - hrs * 3600000) / 60000) };
-}
-
-// time in { hrs, mins } -> ms
-function encodeTime(o) {
-  return o.hrs * 3600000 + o.mins * 60000;
-}
-
-function formatTime(t) {
-  let o = decodeTime(t);
-  return o.hrs + ":" + ("0" + o.mins).substr(-2);
-}
-
 function getCurrentTime() {
   let time = new Date();
   return (
@@ -48,10 +31,10 @@ function showMainMenu() {
     var type,txt; // a leading space is currently required (JS error in Espruino 2v12)
     if (alarm.timer) {
       type = /*LANG*/"Timer";
-      txt = " "+formatTime(alarm.timer);
+      txt = " "+require("sched").formatTime(alarm.timer);
     } else {
       type = /*LANG*/"Alarm";
-      txt = " "+formatTime(alarm.t);
+      txt = " "+require("sched").formatTime(alarm.t);
     }
     if (alarm.rp) txt += "\0"+atob("FBaBAAABgAAcAAHn//////wAHsABzAAYwAAMAADAAAAAAwAAMAADGAAzgAN4AD//////54AAOAABgAA=");
     // rename duplicate alarms
@@ -94,7 +77,7 @@ function editAlarm(alarmIndex, alarm) {
   let a = require("sched").newDefaultAlarm();
   if (!newAlarm) Object.assign(a, alarms[alarmIndex]);
   if (alarm) Object.assign(a,alarm);
-  let t = decodeTime(a.t);
+  let t = require("sched").decodeTime(a.t);
 
   const menu = {
     '': { 'title': /*LANG*/'Alarm' },
@@ -133,7 +116,7 @@ function editAlarm(alarmIndex, alarm) {
     }
   };
   menu[/*LANG*/"Save"] = function() {
-    a.t = encodeTime(t);
+    a.t = require("sched").encodeTime(t);
     a.last = (a.t < getCurrentTime()) ? (new Date()).getDate() : 0;
     if (newAlarm) alarms.push(a);
     else alarms[alarmIndex] = a;
@@ -155,7 +138,7 @@ function editTimer(alarmIndex, alarm) {
   let a = require("sched").newDefaultTimer();
   if (!newAlarm) Object.assign(a, alarms[alarmIndex]);
   if (alarm) Object.assign(a,alarm);
-  let t = decodeTime(a.timer);
+  let t = require("sched").decodeTime(a.timer);
 
   const menu = {
     '': { 'title': /*LANG*/'Timer' },
@@ -176,7 +159,7 @@ function editTimer(alarmIndex, alarm) {
     /*LANG*/'Vibrate': require("buzz_menu").pattern(a.vibrate, v => a.vibrate=v ),
   };
   menu[/*LANG*/"Save"] = function() {
-    a.timer = encodeTime(t);
+    a.timer = require("sched").encodeTime(t);
     a.t = getCurrentTime() + a.timer;
     a.last = 0;
     if (newAlarm) alarms.push(a);
diff --git a/apps/alarm/metadata.json b/apps/alarm/metadata.json
index 5c443dcec..906df810f 100644
--- a/apps/alarm/metadata.json
+++ b/apps/alarm/metadata.json
@@ -2,7 +2,7 @@
   "id": "alarm",
   "name": "Alarms & Timers",
   "shortName": "Alarms",
-  "version": "0.21",
+  "version": "0.22",
   "description": "Set alarms and timers on your Bangle",
   "icon": "app.png",
   "tags": "tool,alarm,widget",
diff --git a/apps/sched/ChangeLog b/apps/sched/ChangeLog
index 0f935caf8..7372f9c4a 100644
--- a/apps/sched/ChangeLog
+++ b/apps/sched/ChangeLog
@@ -3,3 +3,4 @@
 0.03: Fix `getTimeToAlarm` for a timer already used at same day, don't set `last` for timers. 
 0.04: Fix `getTimeToAlarm` to check for next dow if alarm.t lower currentTime.
 0.05: Export new functions (`newDefaultAlarm/Timer`), add Settings page
+0.06: Refactor some methods to library
diff --git a/apps/sched/lib.js b/apps/sched/lib.js
index bfad1ac2d..58ba5daf0 100644
--- a/apps/sched/lib.js
+++ b/apps/sched/lib.js
@@ -106,4 +106,21 @@ exports.getSettings = function () {
 // Write the updated settings back to storage
 exports.setSettings = function(settings) {
   require("Storage").writeJSON("sched.settings.json", settings);
-};
\ No newline at end of file
+};
+
+// time in ms -> { hrs, mins }
+exports.decodeTime = function(t) {
+  t = 0 | t; // sanitise
+  let hrs = 0 | (t / 3600000);
+  return { hrs: hrs, mins: Math.round((t - hrs * 3600000) / 60000) };
+}
+
+// time in { hrs, mins } -> ms
+exports.encodeTime = function(o) {
+  return o.hrs * 3600000 + o.mins * 60000;
+}
+
+exports.formatTime = function(t) {
+  let o = exports.decodeTime(t);
+  return o.hrs + ":" + ("0" + o.mins).substr(-2);
+}
diff --git a/apps/sched/metadata.json b/apps/sched/metadata.json
index 3454d2397..5f61d7d04 100644
--- a/apps/sched/metadata.json
+++ b/apps/sched/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "sched",
   "name": "Scheduler",
-  "version": "0.05",
+  "version": "0.06",
   "description": "Scheduling library for alarms and timers",
   "icon": "app.png",
   "type": "scheduler",
diff --git a/apps/sched/sched.js b/apps/sched/sched.js
index 83f03ac01..7c97600d9 100644
--- a/apps/sched/sched.js
+++ b/apps/sched/sched.js
@@ -5,23 +5,11 @@ if (Bangle.SCHED) {
   delete Bangle.SCHED;
 }
 
-// time in ms -> { hrs, mins }
-function decodeTime(t) {
-  t = 0|t; // sanitise
-  var hrs = 0|(t/3600000);
-  return { hrs : hrs, mins : Math.round((t-hrs*3600000)/60000) };
-}
-
-function formatTime(t) {
-  var o = decodeTime(t);
-  return o.hrs+":"+("0"+o.mins).substr(-2);
-}
-
 function showAlarm(alarm) {
   const settings = require("sched").getSettings();
 
   let msg = "";
-  msg += alarm.timer ? formatTime(alarm.timer) : formatTime(alarm.t);
+  msg += alarm.timer ? require("sched").formatTime(alarm.timer) : require("sched").formatTime(alarm.t);
   if (alarm.msg) {
     msg += "\n"+alarm.msg;
   } else {
diff --git a/apps/sleepphasealarm/ChangeLog b/apps/sleepphasealarm/ChangeLog
index b07c5b9f7..875b3c1da 100644
--- a/apps/sleepphasealarm/ChangeLog
+++ b/apps/sleepphasealarm/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Respect Quiet Mode
 0.03: Add compatibility for Bangle.js 2 and new firmware, added "Alarm at " for the alarm time
 0.04: Read alarms from new scheduling library, account for higher acceleration sensor noise on Bangle.js 2
+0.05: Refactor decodeTime() to scheduling library
diff --git a/apps/sleepphasealarm/app.js b/apps/sleepphasealarm/app.js
index dcd176617..236b71c0b 100644
--- a/apps/sleepphasealarm/app.js
+++ b/apps/sleepphasealarm/app.js
@@ -38,19 +38,11 @@ function calc_ess(acc_magn) {
   }
 }
 
-// copied from alarm app
-// time in ms -> { hrs, mins }
-function decodeTime(t) {
-  t = 0|t; // sanitise
-  var hrs = 0|(t/3600000);
-  return { hrs : hrs, mins : Math.round((t-hrs*3600000)/60000) };
-}
-
 // locate next alarm
 var nextAlarm;
 active.forEach(alarm => {
   const now = new Date();
-  const t = decodeTime(alarm.t);
+  const t = require("sched").decodeTime(alarm.t);
   var dateAlarm = new Date(now.getFullYear(), now.getMonth(), now.getDate(), t.hrs, t.mins);
   if (dateAlarm < now) { // dateAlarm in the past, add 24h
     dateAlarm.setTime(dateAlarm.getTime() + (24*60*60*1000));
diff --git a/apps/sleepphasealarm/metadata.json b/apps/sleepphasealarm/metadata.json
index bc75027c2..aecfa36e4 100644
--- a/apps/sleepphasealarm/metadata.json
+++ b/apps/sleepphasealarm/metadata.json
@@ -2,11 +2,12 @@
   "id": "sleepphasealarm",
   "name": "SleepPhaseAlarm",
   "shortName": "SleepPhaseAlarm",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Uses the accelerometer to estimate sleep and wake states with the principle of Estimation of Stationary Sleep-segments (ESS, see https://ubicomp.eti.uni-siegen.de/home/datasets/ichi14/index.html.en). This app will read the next alarm from the alarm application and will wake you up to 30 minutes early at the best guessed time when you are almost already awake.",
   "icon": "app.png",
   "tags": "alarm",
   "supports": ["BANGLEJS","BANGLEJS2"],
+  "dependencies": {"scheduler":"type"},
   "storage": [
     {"name":"sleepphasealarm.app.js","url":"app.js"},
     {"name":"sleepphasealarm.img","url":"app-icon.js","evaluate":true}