diff --git a/apps/a_dndtoggle/settings.js b/apps/a_dndtoggle/settings.js
index 5316525b3..483af8c97 100644
--- a/apps/a_dndtoggle/settings.js
+++ b/apps/a_dndtoggle/settings.js
@@ -29,5 +29,4 @@
     }
   
     E.showMenu(buildMainMenu());
-  });
-  
\ No newline at end of file
+  })
diff --git a/apps/activepedom/settings.js b/apps/activepedom/settings.js
index 3b64d8735..16799f0db 100644
--- a/apps/activepedom/settings.js
+++ b/apps/activepedom/settings.js
@@ -109,4 +109,4 @@
     },
   };
   E.showMenu(menu);
-});
+})
diff --git a/apps/agpsdata/settings.js b/apps/agpsdata/settings.js
index 64fa25330..95b06fe55 100644
--- a/apps/agpsdata/settings.js
+++ b/apps/agpsdata/settings.js
@@ -68,4 +68,4 @@ function buildMainMenu() {
 }
 
 E.showMenu(buildMainMenu());
-});
+})
diff --git a/apps/alarm/settings.js b/apps/alarm/settings.js
index 765e5a5fa..2843fbdb1 100644
--- a/apps/alarm/settings.js
+++ b/apps/alarm/settings.js
@@ -48,4 +48,4 @@
   };
 
   E.showMenu(appMenu);
-});
+})
diff --git a/apps/andark/settings.js b/apps/andark/settings.js
index 708913705..7bbceb2c2 100644
--- a/apps/andark/settings.js
+++ b/apps/andark/settings.js
@@ -25,4 +25,4 @@
   };
 
   E.showMenu(appMenu);
-});
+})
diff --git a/apps/antonclkplus/settings.js b/apps/antonclkplus/settings.js
index 4448c00ed..70851e983 100644
--- a/apps/antonclkplus/settings.js
+++ b/apps/antonclkplus/settings.js
@@ -94,4 +94,4 @@
 
   E.showMenu(mainmenu);
 
-});
+})
diff --git a/apps/banglexercise/settings.js b/apps/banglexercise/settings.js
index 0b52acd72..a52634faf 100644
--- a/apps/banglexercise/settings.js
+++ b/apps/banglexercise/settings.js
@@ -17,4 +17,4 @@
       }
     }
   });
-});
+})
diff --git a/apps/barclock/settings.js b/apps/barclock/settings.js
index 04f0a38ba..bc292ef6f 100644
--- a/apps/barclock/settings.js
+++ b/apps/barclock/settings.js
@@ -32,4 +32,4 @@
   }
   require("ClockFace_menu").addItems(menu, save, items);
   E.showMenu(menu);
-});
+})
diff --git a/apps/berlinc/settings.js b/apps/berlinc/settings.js
index a1b655a62..b240a5f46 100644
--- a/apps/berlinc/settings.js
+++ b/apps/berlinc/settings.js
@@ -23,4 +23,4 @@
   };
   E.showMenu(mainmenu);
 
-});
+})
diff --git a/apps/bikespeedo/settings.js b/apps/bikespeedo/settings.js
index bb943c081..0326d7529 100644
--- a/apps/bikespeedo/settings.js
+++ b/apps/bikespeedo/settings.js
@@ -68,4 +68,4 @@
 
   E.showMenu(appMenu);
 
-});
+})
diff --git a/apps/blc/blc.settings.js b/apps/blc/blc.settings.js
index 00e9c284b..9143fc16e 100644
--- a/apps/blc/blc.settings.js
+++ b/apps/blc/blc.settings.js
@@ -69,4 +69,4 @@
     //};
     
     E.showMenu(mainmenu);
-});
+})
diff --git a/apps/blecsc/clkinfo.js b/apps/blecsc/clkinfo.js
index 9a9515c3a..69cd022af 100644
--- a/apps/blecsc/clkinfo.js
+++ b/apps/blecsc/clkinfo.js
@@ -70,5 +70,3 @@
   };
   return ci;
 })
-
-
diff --git a/apps/boxclk/settings.js b/apps/boxclk/settings.js
index e35db455d..c4b41101b 100644
--- a/apps/boxclk/settings.js
+++ b/apps/boxclk/settings.js
@@ -91,4 +91,4 @@
   });
 
   E.showMenu(menu);
-});
+})
diff --git a/apps/bthrm/settings.js b/apps/bthrm/settings.js
index 68e958db8..310816dda 100644
--- a/apps/bthrm/settings.js
+++ b/apps/bthrm/settings.js
@@ -371,4 +371,4 @@
   };
 
   E.showMenu(buildMainMenu());
-});
+})
diff --git a/apps/carcrazy/settings.js b/apps/carcrazy/settings.js
index ee3bbd417..48301a865 100644
--- a/apps/carcrazy/settings.js
+++ b/apps/carcrazy/settings.js
@@ -17,4 +17,4 @@
     }
   };
   E.showMenu(menu);
-});
+})
diff --git a/apps/chimer/settings.js b/apps/chimer/settings.js
index 55160c9be..1cfb980f4 100644
--- a/apps/chimer/settings.js
+++ b/apps/chimer/settings.js
@@ -91,4 +91,4 @@
 
   settings = readSettings();
   showMainMenu();
-});
+})
diff --git a/apps/circlesclock/settings.js b/apps/circlesclock/settings.js
index 714b48f2e..0a92f5a5a 100644
--- a/apps/circlesclock/settings.js
+++ b/apps/circlesclock/settings.js
@@ -92,4 +92,4 @@
   }
 
   showMainMenu();
-});
+})
diff --git a/apps/clicompleteclk/settings.js b/apps/clicompleteclk/settings.js
index 0213ead6e..f062b98b1 100644
--- a/apps/clicompleteclk/settings.js
+++ b/apps/clicompleteclk/settings.js
@@ -47,4 +47,4 @@
     },
     '< Back': back,
   });
-});
+})
diff --git a/apps/clkinfocal/settings.js b/apps/clkinfocal/settings.js
index 6fe8f2817..508de5ddc 100644
--- a/apps/clkinfocal/settings.js
+++ b/apps/clkinfocal/settings.js
@@ -34,4 +34,4 @@
     }
   });
 
-});
+})
diff --git a/apps/clkinfogps/clkinfo.js b/apps/clkinfogps/clkinfo.js
index 7db9bbdae..740e05eda 100644
--- a/apps/clkinfogps/clkinfo.js
+++ b/apps/clkinfogps/clkinfo.js
@@ -124,4 +124,4 @@
   };
 
   return info;
-});
+})
diff --git a/apps/clkinfom/clkinfo.js b/apps/clkinfom/clkinfo.js
index a3dae43e1..f01649c4c 100644
--- a/apps/clkinfom/clkinfo.js
+++ b/apps/clkinfom/clkinfo.js
@@ -58,4 +58,4 @@
   };
 
   return info;
-});
+})
diff --git a/apps/clkinfostopw/clkinfo.js b/apps/clkinfostopw/clkinfo.js
index fbbe80a55..8b7a6a9ad 100644
--- a/apps/clkinfostopw/clkinfo.js
+++ b/apps/clkinfostopw/clkinfo.js
@@ -74,4 +74,4 @@
             }
         ]
     };
-});
+})
diff --git a/apps/clkinfostopw/clkinfo.ts b/apps/clkinfostopw/clkinfo.ts
index f0c2a6ccb..78794205e 100644
--- a/apps/clkinfostopw/clkinfo.ts
+++ b/apps/clkinfostopw/clkinfo.ts
@@ -80,4 +80,4 @@
       }
     ]
   };
-}) satisfies ClockInfoFunc
+}) satisfies ClockInfoFunc // FIXME: semi-colon added automatically when Typescript generates Javascript file?
diff --git a/apps/clockcal/settings.js b/apps/clockcal/settings.js
index ea613f5c0..ddacb4a16 100644
--- a/apps/clockcal/settings.js
+++ b/apps/clockcal/settings.js
@@ -114,4 +114,4 @@
     };
     // Show the menu
     E.showMenu(menu);
-});
+})
diff --git a/apps/cogclock/settings.js b/apps/cogclock/settings.js
index fb1dd761c..deae484c9 100644
--- a/apps/cogclock/settings.js
+++ b/apps/cogclock/settings.js
@@ -7,4 +7,4 @@
     "showDate", "hideWidgets"
   ]);
   E.showMenu(menu);
-});
+})
diff --git a/apps/counter2/settings.js b/apps/counter2/settings.js
index b38df1824..f97d49ad3 100644
--- a/apps/counter2/settings.js
+++ b/apps/counter2/settings.js
@@ -52,4 +52,4 @@
     };
     // Show the menu
     E.showMenu(menu);
-});
+})
diff --git a/apps/cprassist/settings.js b/apps/cprassist/settings.js
index 5776baa0b..5099d0b7d 100644
--- a/apps/cprassist/settings.js
+++ b/apps/cprassist/settings.js
@@ -61,4 +61,4 @@
     }
   };
   E.showMenu(menu);
-});
+})
diff --git a/apps/daisy/settings.js b/apps/daisy/settings.js
index c0a2ffeea..250633dea 100644
--- a/apps/daisy/settings.js
+++ b/apps/daisy/settings.js
@@ -56,4 +56,3 @@
     }
   });
 })
-
diff --git a/apps/dane_tcr/settings.js b/apps/dane_tcr/settings.js
index 46988ec26..c13a0825d 100644
--- a/apps/dane_tcr/settings.js
+++ b/apps/dane_tcr/settings.js
@@ -54,4 +54,4 @@
     },
     '< Back': back
   });
-});
\ No newline at end of file
+})
diff --git a/apps/dragboard/settings.js b/apps/dragboard/settings.js
index 59a13c443..2aac13b28 100644
--- a/apps/dragboard/settings.js
+++ b/apps/dragboard/settings.js
@@ -45,4 +45,4 @@
   };
 
   E.showMenu(appMenu);
-});
\ No newline at end of file
+})
diff --git a/apps/draguboard/settings.js b/apps/draguboard/settings.js
index ff4ede637..58634b1b3 100644
--- a/apps/draguboard/settings.js
+++ b/apps/draguboard/settings.js
@@ -41,4 +41,4 @@
   };
 
   E.showMenu(appMenu);
-});
\ No newline at end of file
+})
diff --git a/apps/drained/settings.js b/apps/drained/settings.js
index ce72f215f..d82a9f6d4 100644
--- a/apps/drained/settings.js
+++ b/apps/drained/settings.js
@@ -87,4 +87,4 @@
         });
     };
     updateAndRedraw();
-});
+})
diff --git a/apps/drinkcounter/settings.js b/apps/drinkcounter/settings.js
index 336229b73..8353103e3 100644
--- a/apps/drinkcounter/settings.js
+++ b/apps/drinkcounter/settings.js
@@ -55,4 +55,4 @@
 
   E.showMenu(mainmenu);
 
-});
+})
diff --git a/apps/dtlaunch/settings-b2.js b/apps/dtlaunch/settings-b2.js
index 6a50f90d4..f6894e289 100644
--- a/apps/dtlaunch/settings-b2.js
+++ b/apps/dtlaunch/settings-b2.js
@@ -65,4 +65,4 @@
       }
     },
   });
-});
+})
diff --git a/apps/ffcniftyb/settings.js b/apps/ffcniftyb/settings.js
index da350edd8..8c3bb6e4d 100644
--- a/apps/ffcniftyb/settings.js
+++ b/apps/ffcniftyb/settings.js
@@ -28,4 +28,4 @@
   });
 
   E.showMenu(menu);
-});
+})
diff --git a/apps/folderlaunch/settings.js b/apps/folderlaunch/settings.js
index b589bb3f7..98720a1db 100644
--- a/apps/folderlaunch/settings.js
+++ b/apps/folderlaunch/settings.js
@@ -248,4 +248,4 @@
         });
     };
     showMainMenu();
-});
+})
diff --git a/apps/gassist/settings.js b/apps/gassist/settings.js
index 20634ed5e..0b54c350f 100644
--- a/apps/gassist/settings.js
+++ b/apps/gassist/settings.js
@@ -29,4 +29,4 @@
   }
   // Initially show the menu
   showMenu();
-});
+})
diff --git a/apps/gbmusic/settings.js b/apps/gbmusic/settings.js
index 9b8d35be9..70d96c1e9 100644
--- a/apps/gbmusic/settings.js
+++ b/apps/gbmusic/settings.js
@@ -38,4 +38,4 @@
   };
 
   E.showMenu(menu);
-});
+})
diff --git a/apps/getup/settings.js b/apps/getup/settings.js
index f34262f2a..db84fd84d 100644
--- a/apps/getup/settings.js
+++ b/apps/getup/settings.js
@@ -45,4 +45,4 @@
     },
   };
   E.showMenu(menu);
-});
+})
diff --git a/apps/gipy/settings.js b/apps/gipy/settings.js
index e3b00359c..9562bc3c1 100644
--- a/apps/gipy/settings.js
+++ b/apps/gipy/settings.js
@@ -99,4 +99,4 @@
             }
         }
     });
-});
+})
diff --git a/apps/gpsrec/settings.js b/apps/gpsrec/settings.js
index 23a58d58f..287073b0c 100644
--- a/apps/gpsrec/settings.js
+++ b/apps/gpsrec/settings.js
@@ -1,4 +1,4 @@
 (function(back) {
-  // just go right to our app - we need all the memory
+  // just go right to our app - we need all the memory */
   load("gpsrec.app.js");
-})();
+})()
diff --git a/apps/gpssetup/settings.js b/apps/gpssetup/settings.js
index 0e3c621d1..59988b788 100644
--- a/apps/gpssetup/settings.js
+++ b/apps/gpssetup/settings.js
@@ -1,4 +1,4 @@
 (function(back) {
-  // just go right to our app
+  /* just go right to our app*/
   load("gpssetup.app.js");
-})();
+})()
diff --git a/apps/iconlaunch/settings.js b/apps/iconlaunch/settings.js
index 3278075e4..ef2c188d7 100644
--- a/apps/iconlaunch/settings.js
+++ b/apps/iconlaunch/settings.js
@@ -50,4 +50,4 @@
     },
   };
   E.showMenu(appMenu);
-});
+})
diff --git a/apps/infoclk/ChangeLog b/apps/infoclk/ChangeLog
index def512856..911e64894 100644
--- a/apps/infoclk/ChangeLog
+++ b/apps/infoclk/ChangeLog
@@ -12,3 +12,4 @@
       Broke out config loading into separate file to avoid duplicating a whole bunch of code
       Added support for fast loading
 0.10: Minor code improvements
+0.11: Make sure variables are properly defined in settings.js
diff --git a/apps/infoclk/metadata.json b/apps/infoclk/metadata.json
index 1b1b6e604..ddd16c4a6 100644
--- a/apps/infoclk/metadata.json
+++ b/apps/infoclk/metadata.json
@@ -1,7 +1,7 @@
 {
   "id": "infoclk",
   "name": "Informational clock",
-  "version": "0.10",
+  "version": "0.11",
   "description": "A configurable clock with extra info and shortcuts when unlocked, but large time when locked",
   "readme": "README.md",
   "icon": "icon.png",
@@ -41,4 +41,4 @@
   "dependencies": {
     "weather": "app"
   }
-}
\ No newline at end of file
+}
diff --git a/apps/infoclk/settings.js b/apps/infoclk/settings.js
index a9adf87fc..dd18626e1 100644
--- a/apps/infoclk/settings.js
+++ b/apps/infoclk/settings.js
@@ -17,6 +17,9 @@
         } else return '' + hour;
     }
 
+  let minute; // Is used in onchange functions. Defined here to appease the linter.
+  let hour; // Is used in onchange functions. Defined here to appease the linter.
+
     // The menu for configuring when the seconds are shown
     function showSecondsMenu() {
         E.showMenu({
@@ -744,4 +747,4 @@
     }
 
     showMainMenu();
-});
\ No newline at end of file
+})
diff --git a/apps/largeclock/settings.js b/apps/largeclock/settings.js
index 4ebf842ce..a5e35192a 100644
--- a/apps/largeclock/settings.js
+++ b/apps/largeclock/settings.js
@@ -82,4 +82,4 @@
   };
 
   E.showMenu(mainMenu);
-});
+})
diff --git a/apps/launch/settings.js b/apps/launch/settings.js
index 496a6d77e..f4f3bb31b 100644
--- a/apps/launch/settings.js
+++ b/apps/launch/settings.js
@@ -34,4 +34,4 @@
     }
   };
   E.showMenu(appMenu);
-});
+})
diff --git a/apps/lint_exemptions.js b/apps/lint_exemptions.js
index 3bcbf6fd3..1b3a3cc11 100644
--- a/apps/lint_exemptions.js
+++ b/apps/lint_exemptions.js
@@ -528,7 +528,7 @@ module.exports = {
     ]
   },
   "apps/usgs/settings.js": {
-    "hash": "af1b7bc7e041c1e6988b407b6c8ee66dbd6a0e181a20caf102d2abdb6dbd5ac0",
+    "hash": "00ee672a6920f5667bfbd2988fd2853cfd579895a843ae036a00028dcb13878d",
     "rules": [
       "no-undef"
     ]
diff --git a/apps/messagelist/settings.js b/apps/messagelist/settings.js
index 1dc80ade1..1bf60c744 100644
--- a/apps/messagelist/settings.js
+++ b/apps/messagelist/settings.js
@@ -136,4 +136,4 @@
   }
 
   showMainMenu();
-});
+})
diff --git a/apps/messages/settings.js b/apps/messages/settings.js
index 1d429580c..4ccc47237 100644
--- a/apps/messages/settings.js
+++ b/apps/messages/settings.js
@@ -97,4 +97,4 @@
     },
   };
   E.showMenu(mainmenu);
-});
+})
diff --git a/apps/messages_light/messages_light.settings.js b/apps/messages_light/messages_light.settings.js
index cd813d928..890c23692 100644
--- a/apps/messages_light/messages_light.settings.js
+++ b/apps/messages_light/messages_light.settings.js
@@ -23,5 +23,4 @@
       },
     };
     E.showMenu(mainmenu);
-  });
-  
\ No newline at end of file
+  })
diff --git a/apps/messagesoverlay/settings.js b/apps/messagesoverlay/settings.js
index cd76bf115..93e57fae0 100644
--- a/apps/messagesoverlay/settings.js
+++ b/apps/messagesoverlay/settings.js
@@ -63,4 +63,4 @@
   }
 
   E.showMenu(buildMainMenu());
-});
+})
diff --git a/apps/metronome/settings.js b/apps/metronome/settings.js
index 1dd4d92df..3eacd737d 100644
--- a/apps/metronome/settings.js
+++ b/apps/metronome/settings.js
@@ -45,4 +45,4 @@
     },
   };
   E.showMenu(menu);
-});
+})
diff --git a/apps/multitimer/settings.js b/apps/multitimer/settings.js
index 4faeb2573..fbed187a9 100644
--- a/apps/multitimer/settings.js
+++ b/apps/multitimer/settings.js
@@ -29,4 +29,4 @@
       }
     },
   });
-});
+})
diff --git a/apps/nesclock/settings.js b/apps/nesclock/settings.js
index 0bbecc2ce..154b3b6b6 100644
--- a/apps/nesclock/settings.js
+++ b/apps/nesclock/settings.js
@@ -39,4 +39,4 @@
 
   E.showMenu(mainmenu);
 
-});
+})
diff --git a/apps/nightwatch/nightwatch.settings.js b/apps/nightwatch/nightwatch.settings.js
index 744ebd8dc..f4afe2e85 100644
--- a/apps/nightwatch/nightwatch.settings.js
+++ b/apps/nightwatch/nightwatch.settings.js
@@ -22,4 +22,4 @@
       }
     },
   });
-});
+})
diff --git a/apps/owmweather/settings.js b/apps/owmweather/settings.js
index f6b84c785..69aabfad0 100644
--- a/apps/owmweather/settings.js
+++ b/apps/owmweather/settings.js
@@ -81,4 +81,4 @@
   }
 
   E.showMenu(buildMainMenu());
-});
+})
diff --git a/apps/pebble/pebble.settings.js b/apps/pebble/pebble.settings.js
index 83032270a..c4b860792 100644
--- a/apps/pebble/pebble.settings.js
+++ b/apps/pebble/pebble.settings.js
@@ -54,4 +54,4 @@
       }
     },
   });
-});
+})
diff --git a/apps/pebbled/pebbled.settings.js b/apps/pebbled/pebbled.settings.js
index d54517a70..29f8c85bc 100644
--- a/apps/pebbled/pebbled.settings.js
+++ b/apps/pebbled/pebbled.settings.js
@@ -55,4 +55,4 @@
             },
         }
     });
-});
+})
diff --git a/apps/popconlaunch/settings.js b/apps/popconlaunch/settings.js
index 29528c5dd..fa27f816b 100644
--- a/apps/popconlaunch/settings.js
+++ b/apps/popconlaunch/settings.js
@@ -12,4 +12,4 @@
         },
     };
     E.showMenu(menu);
-});
+})
diff --git a/apps/poweroff/ChangeLog b/apps/poweroff/ChangeLog
index a62a1bc43..d39fb5a31 100644
--- a/apps/poweroff/ChangeLog
+++ b/apps/poweroff/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Add prompt before shutdown
 0.03: Add settings to configure prompt
 0.04: Minor code improvements
+0.05: Comment out unused function in settings.js
diff --git a/apps/poweroff/metadata.json b/apps/poweroff/metadata.json
index 9c558bc5b..218e4b441 100644
--- a/apps/poweroff/metadata.json
+++ b/apps/poweroff/metadata.json
@@ -1,7 +1,7 @@
 { "id": "poweroff",
 "name": "Poweroff",
 "shortName":"Poweroff",
-"version": "0.04",
+"version": "0.05",
 "description": "Simple app to power off your Bangle.js",
 "icon": "app.png",
 "tags": "tool, poweroff, shutdown",
diff --git a/apps/poweroff/settings.js b/apps/poweroff/settings.js
index b22a7918a..8c700c8cd 100644
--- a/apps/poweroff/settings.js
+++ b/apps/poweroff/settings.js
@@ -8,26 +8,26 @@
     require('Storage').writeJSON(FILE, settings);
   }
 
-  // Helper method which uses int-based menu item for set of string values
-  function stringItems(startvalue, writer, values) {
-    return {
-      value: (startvalue === undefined ? 0 : values.indexOf(startvalue)),
-      format: v => values[v],
-      min: 0,
-      max: values.length - 1,
-      wrap: true,
-      step: 1,
-      onchange: v => {
-        writer(values[v]);
-        writeSettings();
-      }
-    };
-  }
-
-  // Helper method which breaks string set settings down to local settings object
-  function stringInSettings(name, values) {
-    return stringItems(settings[name], v => settings[name] = v, values);
-  }
+  //// Helper method which uses int-based menu item for set of string values
+  //function stringItems(startvalue, writer, values) {
+  //  return {
+  //    value: (startvalue === undefined ? 0 : values.indexOf(startvalue)),
+  //    format: v => values[v],
+  //    min: 0,
+  //    max: values.length - 1,
+  //    wrap: true,
+  //    step: 1,
+  //    onchange: v => {
+  //      writer(values[v]);
+  //      writeSettings();
+  //    }
+  //  };
+  //}
+  //
+  //// Helper method which breaks string set settings down to local settings object
+  //function stringInSettings(name, values) {
+  //  return stringItems(settings[name], v => settings[name] = v, values);
+  //}
 
   var mainmenu = {
     "": {
@@ -43,4 +43,4 @@
   }
   };
   E.showMenu(mainmenu);
-});
+})
diff --git a/apps/puzzle15/puzzle15.settings.js b/apps/puzzle15/puzzle15.settings.js
index 352ec4315..152b354b5 100644
--- a/apps/puzzle15/puzzle15.settings.js
+++ b/apps/puzzle15/puzzle15.settings.js
@@ -45,6 +45,4 @@
   // Actually display the menu
   E.showMenu(mainmenu);
 
-});
-
-// end of file
\ No newline at end of file
+})
diff --git a/apps/qcenter/settings.js b/apps/qcenter/settings.js
index ab7d561d1..2db1f28cc 100644
--- a/apps/qcenter/settings.js
+++ b/apps/qcenter/settings.js
@@ -152,4 +152,4 @@
   }
 
   showMainMenu();
-});
+})
diff --git a/apps/rebbleagenda/settings.js b/apps/rebbleagenda/settings.js
index 8ed2ceae5..40be27920 100644
--- a/apps/rebbleagenda/settings.js
+++ b/apps/rebbleagenda/settings.js
@@ -66,4 +66,4 @@
       },
     }
   });
-});
\ No newline at end of file
+})
diff --git a/apps/recorder/clkinfo.js b/apps/recorder/clkinfo.js
index 6ca4f59d5..cde5c8ef4 100644
--- a/apps/recorder/clkinfo.js
+++ b/apps/recorder/clkinfo.js
@@ -35,4 +35,4 @@
 			},
 		] : [],
 	};
-});
+})
diff --git a/apps/rep/settings.js b/apps/rep/settings.js
index bfadacda1..8643f4274 100644
--- a/apps/rep/settings.js
+++ b/apps/rep/settings.js
@@ -41,4 +41,4 @@
         };
     }
     E.showMenu(menu);
-});
+})
diff --git a/apps/saclock/settings.js b/apps/saclock/settings.js
index fc50d04dc..10d0489a7 100644
--- a/apps/saclock/settings.js
+++ b/apps/saclock/settings.js
@@ -20,4 +20,4 @@
     hideWidgets: settings.hideWidgets,
   });
   E.showMenu(menu);
-});
+})
diff --git a/apps/sched/settings.js b/apps/sched/settings.js
index 76036db2b..c03cd6679 100644
--- a/apps/sched/settings.js
+++ b/apps/sched/settings.js
@@ -76,4 +76,4 @@
       require("sched").setSettings(settings);
     })
   });
-});
+})
diff --git a/apps/score/score.settings.js b/apps/score/score.settings.js
index 88e367821..f32bb6189 100644
--- a/apps/score/score.settings.js
+++ b/apps/score/score.settings.js
@@ -216,4 +216,4 @@
     }
 
   });
-})();
+})()
diff --git a/apps/sensortools/settings.js b/apps/sensortools/settings.js
index ae631e60c..a5d3dfad1 100644
--- a/apps/sensortools/settings.js
+++ b/apps/sensortools/settings.js
@@ -102,4 +102,4 @@
   }
 
   E.showMenu(buildMainMenu());
-});
+})
diff --git a/apps/shadowclk/settings.js b/apps/shadowclk/settings.js
index 1472cb099..183370082 100644
--- a/apps/shadowclk/settings.js
+++ b/apps/shadowclk/settings.js
@@ -155,4 +155,4 @@
   }
   // Initially show the menu
   showMenu();
-});
+})
diff --git a/apps/shortcuts/settings.js b/apps/shortcuts/settings.js
index 419b186d6..2c9ebd87a 100644
--- a/apps/shortcuts/settings.js
+++ b/apps/shortcuts/settings.js
@@ -62,5 +62,4 @@
     "BTN3 app": () => showApps("BTN3")
   };
   E.showMenu(mainMenu);
-});
-  
\ No newline at end of file
+})
diff --git a/apps/simplebgclock/settings.js b/apps/simplebgclock/settings.js
index 8fd042b3b..17524ca8d 100644
--- a/apps/simplebgclock/settings.js
+++ b/apps/simplebgclock/settings.js
@@ -27,4 +27,4 @@
       }
     }
   });
-});
+})
diff --git a/apps/slomoclock/settings.js b/apps/slomoclock/settings.js
index dcaf0aff6..fd2717927 100644
--- a/apps/slomoclock/settings.js
+++ b/apps/slomoclock/settings.js
@@ -35,4 +35,4 @@
 
   E.showMenu(appMenu);
 
-});
+})
diff --git a/apps/slopeclockpp/settings.js b/apps/slopeclockpp/settings.js
index 2c2d2c463..71c272753 100644
--- a/apps/slopeclockpp/settings.js
+++ b/apps/slopeclockpp/settings.js
@@ -57,4 +57,4 @@
 
 
   showMainMenu();
-});
+})
diff --git a/apps/smclock/settings.js b/apps/smclock/settings.js
index 30119e48d..3dff0a30c 100644
--- a/apps/smclock/settings.js
+++ b/apps/smclock/settings.js
@@ -1,8 +1,8 @@
-// settings menu for Monogram Watch Face
-// Anton Clock settings were used as template
-// helper functions taken from Anton Clock
-
 (function (back) {
+  // settings menu for Monogram Watch Face
+  // Anton Clock settings were used as template
+  // helper functions taken from Anton Clock  
+  
   var FILE = "smclock.json";
   // load settings from the file
   // assign default values if it doesn't exist
@@ -87,6 +87,4 @@
 
   // Actually display the menu
   E.showMenu(mainmenu);
-});
-
-// end of file
+})
diff --git a/apps/speedalt/settings.js b/apps/speedalt/settings.js
index aeaa84f2c..a4e70c2c0 100644
--- a/apps/speedalt/settings.js
+++ b/apps/speedalt/settings.js
@@ -79,4 +79,4 @@
   
   E.showMenu(appMenu);
 
-});
+})
diff --git a/apps/speedalt2/settings.js b/apps/speedalt2/settings.js
index 63fa424ba..d0e6c2fda 100644
--- a/apps/speedalt2/settings.js
+++ b/apps/speedalt2/settings.js
@@ -99,4 +99,4 @@
   
   E.showMenu(appMenu);
 
-});
+})
diff --git a/apps/swp2clk/ChangeLog b/apps/swp2clk/ChangeLog
index d6f9f6e8c..975da5800 100644
--- a/apps/swp2clk/ChangeLog
+++ b/apps/swp2clk/ChangeLog
@@ -2,3 +2,4 @@
 0.02: Fix deleting from white and black lists.
 0.03: Adapt to availability of Bangle.showClock and Bangle.load
 0.04: Fix 'Uncaught ReferenceError: "__FILE__" is not defined' error (fix #2326)
+0.05: Fix settings didn't call the Storage class correctly.
diff --git a/apps/swp2clk/metadata.json b/apps/swp2clk/metadata.json
index b4436bd39..a4ef71488 100644
--- a/apps/swp2clk/metadata.json
+++ b/apps/swp2clk/metadata.json
@@ -2,7 +2,7 @@
   "id": "swp2clk",
   "name": "Swipe back to the Clock",
   "shortName": "Swipe to Clock",
-  "version": "0.04",
+  "version": "0.05",
   "description": "Let's you swipe from left to right on any app to return back to the clock face. Please configure in the settings app after installing to activate, since its disabled by default.",
   "icon": "app.png",
   "type": "bootloader",
diff --git a/apps/swp2clk/settings.js b/apps/swp2clk/settings.js
index 4f8db5eb8..0503a455a 100644
--- a/apps/swp2clk/settings.js
+++ b/apps/swp2clk/settings.js
@@ -150,10 +150,10 @@
   };
 
   var getAppList = () => {
-    var appList = storage
+    var appList = require("Storage")
       .list(/\.info$/)
       .map((appInfoFileName) => {
-        var appInfo = storage.readJSON(appInfoFileName, 1);
+        var appInfo = require("Storage").readJSON(appInfoFileName, 1);
         return (
           appInfo && {
             name: appInfo.name,
@@ -180,4 +180,4 @@
 
   settings = readSettings();
   showMainMenu();
-});
+})
diff --git a/apps/taglaunch/settings.js b/apps/taglaunch/settings.js
index 94ec34a36..b85ff65f6 100644
--- a/apps/taglaunch/settings.js
+++ b/apps/taglaunch/settings.js
@@ -34,4 +34,4 @@
     }
   };
   E.showMenu(appMenu);
-});
+})
diff --git a/apps/thunder/settings.js b/apps/thunder/settings.js
index 1a2959227..90e3c4231 100644
--- a/apps/thunder/settings.js
+++ b/apps/thunder/settings.js
@@ -37,4 +37,4 @@
 
   loadSettings();
   showMenu();
-});
+})
diff --git a/apps/timecal/timecal.settings.js b/apps/timecal/timecal.settings.js
index 3a38eed09..d7824815a 100644
--- a/apps/timecal/timecal.settings.js
+++ b/apps/timecal/timecal.settings.js
@@ -104,4 +104,4 @@
   };
 
   showMainMenu();
-});
+})
diff --git a/apps/timerclk/settings.js b/apps/timerclk/settings.js
index 1a8500add..0f4acfc70 100644
--- a/apps/timerclk/settings.js
+++ b/apps/timerclk/settings.js
@@ -312,4 +312,4 @@
     }
   };
   E.showMenu(mainMenu);
-});
+})
diff --git a/apps/timestamplog/settings.js b/apps/timestamplog/settings.js
index 137ed31db..ffdaa4665 100644
--- a/apps/timestamplog/settings.js
+++ b/apps/timestamplog/settings.js
@@ -4,4 +4,4 @@ const tsl = require('timestamplog');
   function(backCb) {
     tsl.launchSettingsMenu(backCb);
   }
-);
+)
diff --git a/apps/toucher/settings.js b/apps/toucher/settings.js
index f3004000a..a8a17125c 100644
--- a/apps/toucher/settings.js
+++ b/apps/toucher/settings.js
@@ -54,4 +54,4 @@
     },
     '< Back': back
   });
-});
+})
diff --git a/apps/touchtimer/settings.js b/apps/touchtimer/settings.js
index d3de4e6d3..4a7464f06 100644
--- a/apps/touchtimer/settings.js
+++ b/apps/touchtimer/settings.js
@@ -81,4 +81,4 @@
 
   settings = readSettings();
   showMainMenu();
-});
+})
diff --git a/apps/trex/settings.js b/apps/trex/settings.js
index 67aa9a518..f435b0ba4 100644
--- a/apps/trex/settings.js
+++ b/apps/trex/settings.js
@@ -16,4 +16,4 @@
     }
   };
   E.showMenu(menu);
-});
+})
diff --git a/apps/usgs/settings.js b/apps/usgs/settings.js
index 8a12197dc..710d071ea 100644
--- a/apps/usgs/settings.js
+++ b/apps/usgs/settings.js
@@ -19,6 +19,9 @@
   }
 
 function popSubMenu() {
+  // FIXME: Linter complains that `data` is not defined. When I defined it 
+  // instead complained that it's not used (no-unused-vars).
+  // Also looking at `getDataStreams` it doesn't return anything so this seems wrong.
   data = getDataStreams();
 }
 function popSubMenuData(data) {
@@ -78,4 +81,4 @@ function getDataStreams() {
 
   // Show the menu
   E.showMenu(menu);
-});
+})
diff --git a/apps/weatherClock/settings.js b/apps/weatherClock/settings.js
index 0aa7330c1..8a2127ba7 100644
--- a/apps/weatherClock/settings.js
+++ b/apps/weatherClock/settings.js
@@ -55,4 +55,4 @@
       },
     }
   });
-});
+})
diff --git a/apps/wid_edit/settings.js b/apps/wid_edit/settings.js
index a632850d6..cf445fe48 100644
--- a/apps/wid_edit/settings.js
+++ b/apps/wid_edit/settings.js
@@ -194,4 +194,4 @@
     E.showMenu(menu);
   }
   mainMenu();
-});
+})
diff --git a/apps/widalarmeta/settings.js b/apps/widalarmeta/settings.js
index 8dd0d81fa..5e83c6f3a 100644
--- a/apps/widalarmeta/settings.js
+++ b/apps/widalarmeta/settings.js
@@ -60,4 +60,4 @@
       }
     },
   });
-});
+})
diff --git a/apps/widbaroalarm/settings.js b/apps/widbaroalarm/settings.js
index 68e7bab6b..4762e1e80 100644
--- a/apps/widbaroalarm/settings.js
+++ b/apps/widbaroalarm/settings.js
@@ -155,4 +155,4 @@
   }
 
   showMainMenu();
-});
+})
diff --git a/apps/widbatwarn/settings.js b/apps/widbatwarn/settings.js
index c3464a82b..352dca467 100644
--- a/apps/widbatwarn/settings.js
+++ b/apps/widbatwarn/settings.js
@@ -42,4 +42,4 @@
     },
   };
   E.showMenu(menu);
-});
\ No newline at end of file
+})
diff --git a/apps/widbgjs/settings.js b/apps/widbgjs/settings.js
index c599183dc..077efaf8a 100644
--- a/apps/widbgjs/settings.js
+++ b/apps/widbgjs/settings.js
@@ -50,4 +50,4 @@
         },
         '< Back': back,
     });
-});
+})
diff --git a/apps/widdst/settings.js b/apps/widdst/settings.js
index 0017cc499..5ed8b0a37 100644
--- a/apps/widdst/settings.js
+++ b/apps/widdst/settings.js
@@ -190,4 +190,4 @@
 
   E.showMenu(dstMenu);
 
-});
+})
diff --git a/apps/widgps/settings.js b/apps/widgps/settings.js
index 7a1c186c9..8f1d99f06 100644
--- a/apps/widgps/settings.js
+++ b/apps/widgps/settings.js
@@ -29,4 +29,4 @@ var mainmenu = {
       },
 };
 E.showMenu(mainmenu);
-});
\ No newline at end of file
+})
diff --git a/apps/widhrm/settings.js b/apps/widhrm/settings.js
index 0b8c989ac..1c696939b 100644
--- a/apps/widhrm/settings.js
+++ b/apps/widhrm/settings.js
@@ -33,4 +33,4 @@
      },
   };
   E.showMenu(menu);
-});
+})
diff --git a/apps/widmp/settings.js b/apps/widmp/settings.js
index a389f7918..e671d9900 100644
--- a/apps/widmp/settings.js
+++ b/apps/widmp/settings.js
@@ -69,4 +69,4 @@
 
   E.showMenu(mainmenu);
 
-});
+})
diff --git a/apps/widshipbell/settings.js b/apps/widshipbell/settings.js
index bb47e9b20..fa1ada630 100644
--- a/apps/widshipbell/settings.js
+++ b/apps/widshipbell/settings.js
@@ -24,4 +24,3 @@
     },
   });
 })
-
diff --git a/apps/widsleepstatus/settings.js b/apps/widsleepstatus/settings.js
index da402e08e..e758a1760 100644
--- a/apps/widsleepstatus/settings.js
+++ b/apps/widsleepstatus/settings.js
@@ -29,4 +29,4 @@
     },
   };
   E.showMenu(menu);
-});
+})
diff --git a/typescript/build.sh b/typescript/build.sh
new file mode 100755
index 000000000..bf5493745
--- /dev/null
+++ b/typescript/build.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+usage(){
+	echo >&2 "Usage: $0"
+	exit 2
+}
+
+if test $# -ne 0
+then usage
+fi
+
+cd "$(dirname "$0")"
+
+npm run build
+
+find ../apps -iname '*.ts' |
+	sed 's/\.ts$/.js/' |
+	grep -E 'clkinfo|setting' |
+	xargs perl -i -pe 's/;$// if eof'