diff --git a/apps/setting/settings.js b/apps/setting/settings.js
index 8f95eb3bb..f55f9937f 100644
--- a/apps/setting/settings.js
+++ b/apps/setting/settings.js
@@ -58,7 +58,7 @@ function resetSettings() {
 settings = storage.readJSON('setting.json', 1);
 if (!settings) resetSettings();
 
-const boolFormat = v => v ? "On" : "Off";
+const boolFormat = v => v ? /*LANG*/"On" : /*LANG*/"Off";
 
 function showMainMenu() {
   var beepMenuItem;
@@ -77,7 +77,7 @@ function showMainMenu() {
     };
   } else { // Bangle.js 1
     var beepV = [false, true, "vib"];
-    var beepN = ["Off", "Piezo", "Vibrate"];
+    var beepN = [/*LANG*/"Off", /*LANG*/"Piezo", /*LANG*/"Vibrate"];
     beepMenuItem = {
       value: Math.max(0 | beepV.indexOf(settings.beep),0),
       min: 0, max: beepV.length-1,
@@ -95,10 +95,10 @@ function showMainMenu() {
   const mainmenu = {
     '': { 'title': 'Settings' },
     '< Back': ()=>load(),
-    'App Settings': ()=>showAppSettingsMenu(),
-    'BLE': ()=>showBLEMenu(),
-    'Beep': beepMenuItem,
-    'Vibration': {
+    /*LANG*/'App Settings': ()=>showAppSettingsMenu(),
+    /*LANG*/'BLE': ()=>showBLEMenu(),
+    /*LANG*/'Beep': beepMenuItem,
+    /*LANG*/'Vibration': {
       value: settings.vibrate,
       format: boolFormat,
       onchange: () => {
@@ -110,7 +110,7 @@ function showMainMenu() {
         }
       }
     },
-    "Quiet Mode": {
+    /*LANG*/"Quiet Mode": {
       value: settings.quiet|0,
       format: v => ["Off", "Alarms", "Silent"][v%3],
       onchange: v => {
@@ -120,13 +120,13 @@ function showMainMenu() {
         if ("qmsched" in WIDGETS) WIDGETS["qmsched"].draw();
       },
     },
-    'Locale': ()=>showLocaleMenu(),
-    'Select Clock': ()=>showClockMenu(),
-    'Set Time': ()=>showSetTimeMenu(),
-    'LCD': ()=>showLCDMenu(),
-    'Theme': ()=>showThemeMenu(),
-    'Utils': ()=>showUtilMenu(),
-    'Turn Off': ()=>{ if (Bangle.softOff) Bangle.softOff(); else Bangle.off() },
+    /*LANG*/'Locale': ()=>showLocaleMenu(),
+    /*LANG*/'Select Clock': ()=>showClockMenu(),
+    /*LANG*/'Set Time': ()=>showSetTimeMenu(),
+    /*LANG*/'LCD': ()=>showLCDMenu(),
+    /*LANG*/'Theme': ()=>showThemeMenu(),
+    /*LANG*/'Utils': ()=>showUtilMenu(),
+    /*LANG*/'Turn Off': ()=>{ if (Bangle.softOff) Bangle.softOff(); else Bangle.off() },
   };
 
   return E.showMenu(mainmenu);
diff --git a/core b/core
index b033af017..5a6cf40b4 160000
--- a/core
+++ b/core
@@ -1 +1 @@
-Subproject commit b033af017f6789a6a7777e6ef1428d94995a9b8b
+Subproject commit 5a6cf40b4030ba909bf5f88b646ac05e41ce4c03
diff --git a/lang/de_DE.json b/lang/de_DE.json
new file mode 100644
index 000000000..02dd72189
--- /dev/null
+++ b/lang/de_DE.json
@@ -0,0 +1,15 @@
+{
+  "//":"German language translations",
+  "GLOBAL": {
+    "//":"Translations that apply for all apps",
+    "Alarm" : "Wecker",
+    "Hours" : "Stunden",
+    "Minutes" : "Minuten",
+    "Enabled" : "Aktiviert",
+    "Settings" : "Einstellungen"
+  },
+  "alarm": {
+    "//":"App-specific overrides",
+    "Alarm" : "Alarm"
+  }
+}
diff --git a/lang/index.json b/lang/index.json
new file mode 100644
index 000000000..7f4bbee37
--- /dev/null
+++ b/lang/index.json
@@ -0,0 +1,3 @@
+[
+  "de_DE.json"
+]