diff --git a/apps/dtlaunch/app-b2.js b/apps/dtlaunch/app-b2.js
index aba09406f..151be96c4 100644
--- a/apps/dtlaunch/app-b2.js
+++ b/apps/dtlaunch/app-b2.js
@@ -1,180 +1,189 @@
 { // must be inside our own scope here so that when we are unloaded everything disappears
-
-/* Desktop launcher
-*
-*/
-
-let settings = Object.assign({
-  showClocks: true,
-  showLaunchers: true,
-  direct: false,
-  oneClickExit:false,
-  swipeExit: false,
-}, require('Storage').readJSON("dtlaunch.json", true) || {});
-
-if (settings.oneClickExit) {
-  var buttonWatch = setWatch(_=> returnToClock, BTN1);
-} 
-
-let s = require("Storage");
-  var apps = s.list(/\.info$/).map(app=>{
-  let a=s.readJSON(app,1);
-  return a && {
-    name:a.name, type:a.type, icon:a.icon, sortorder:a.sortorder, src:a.src
-  };}).filter(
-    app=>app && (app.type=="app" || (app.type=="clock" && settings.showClocks) || (app.type=="launch" && settings.showLaunchers) || !app.type));
   
-apps.sort((a,b)=>{
-  let n=(0|a.sortorder)-(0|b.sortorder);
-  if (n) return n; // do sortorder first
-  if (a.name<b.name) return -1;
-  if (a.name>b.name) return 1;
-  return 0;
-});
-apps.forEach(app=>{
-    if (app.icon)
-      app.icon = s.read(app.icon); // should just be a link to a memory area
+  /* Desktop launcher
+  *
+  */
+  
+  let settings = Object.assign({
+    showClocks: true,
+    showLaunchers: true,
+    direct: false,
+    oneClickExit: false,
+    swipeExit: false,
+    timeOut: "Off"
+  }, require('Storage').readJSON("dtlaunch.json", true) || {});
+  
+  if (settings.oneClickExit) {
+    var buttonWatch = setWatch(_=> returnToClock, BTN1);
+  } 
+  
+  // taken from Icon Launcher with minor alterations
+  if (settings.timeOut!="Off"){
+    let time=parseInt(settings.timeOut);  //the "s" will be trimmed by the parseInt
+    var timeoutToClock = setTimeout(returnToClock,time*1000);  
+  }
+  let s = require("Storage");
+    var apps = s.list(/\.info$/).map(app=>{
+    let a=s.readJSON(app,1);
+    return a && {
+      name:a.name, type:a.type, icon:a.icon, sortorder:a.sortorder, src:a.src
+    };}).filter(
+      app=>app && (app.type=="app" || (app.type=="clock" && settings.showClocks) || (app.type=="launch" && settings.showLaunchers) || !app.type));
+    
+  apps.sort((a,b)=>{
+    let n=(0|a.sortorder)-(0|b.sortorder);
+    if (n) return n; // do sortorder first
+    if (a.name<b.name) return -1;
+    if (a.name>b.name) return 1;
+    return 0;
   });
-
-let Napps = apps.length;
-let Npages = Math.ceil(Napps/4);
-let maxPage = Npages-1;
-let selected = -1;
-let oldselected = -1;
-let page = 0;
-const XOFF = 24;
-const YOFF = 30;
-
-let drawIcon= function(p,n,selected) {
-    let x = (n%2)*72+XOFF; 
-    let y = n>1?72+YOFF:YOFF;
-    (selected?g.setColor(g.theme.fgH):g.setColor(g.theme.bg)).fillRect(x+11,y+3,x+60,y+52);
-    g.clearRect(x+12,y+4,x+59,y+51);
-    g.setColor(g.theme.fg);
-    try{g.drawImage(apps[p*4+n].icon,x+12,y+4);} catch(e){}
-    g.setFontAlign(0,-1,0).setFont("6x8",1);
-    let txt =  apps[p*4+n].name.replace(/([a-z])([A-Z])/g, "$1 $2").split(" ");
-    let lineY = 0;
-    let line = "";
-    while (txt.length > 0){
-      let c = txt.shift();
-      if (c.length + 1 + line.length > 13){
-        if (line.length > 0){
-          g.drawString(line.trim(),x+36,y+54+lineY*8);
-          lineY++;
+  apps.forEach(app=>{
+      if (app.icon)
+        app.icon = s.read(app.icon); // should just be a link to a memory area
+    });
+  
+  let Napps = apps.length;
+  let Npages = Math.ceil(Napps/4);
+  let maxPage = Npages-1;
+  let selected = -1;
+  let oldselected = -1;
+  let page = 0;
+  const XOFF = 24;
+  const YOFF = 30;
+  
+  let drawIcon= function(p,n,selected) {
+      let x = (n%2)*72+XOFF; 
+      let y = n>1?72+YOFF:YOFF;
+      (selected?g.setColor(g.theme.fgH):g.setColor(g.theme.bg)).fillRect(x+11,y+3,x+60,y+52);
+      g.clearRect(x+12,y+4,x+59,y+51);
+      g.setColor(g.theme.fg);
+      try{g.drawImage(apps[p*4+n].icon,x+12,y+4);} catch(e){}
+      g.setFontAlign(0,-1,0).setFont("6x8",1);
+      let txt =  apps[p*4+n].name.replace(/([a-z])([A-Z])/g, "$1 $2").split(" ");
+      let lineY = 0;
+      let line = "";
+      while (txt.length > 0){
+        let c = txt.shift();
+        if (c.length + 1 + line.length > 13){
+          if (line.length > 0){
+            g.drawString(line.trim(),x+36,y+54+lineY*8);
+            lineY++;
+          }
+          line = c;
+        } else {
+          line += " " + c;
         }
-        line = c;
-      } else {
-        line += " " + c;
       }
-    }
-    g.drawString(line.trim(),x+36,y+54+lineY*8);
-};
-
-let drawPage = function(p){
-    g.reset();
-    g.clearRect(0,24,175,175);
-    let O = 88+YOFF/2-12*(Npages/2);
-    for (let j=0;j<Npages;j++){
-        let y = O+j*12;
-        g.setColor(g.theme.fg);
-        if (j==page) g.fillCircle(XOFF/2,y,4);
-        else g.drawCircle(XOFF/2,y,4);
-    }
-    for (let i=0;i<4;i++) {
-        if (!apps[p*4+i]) return i;
-        drawIcon(p,i,selected==i && !settings.direct);
-    }
-    g.flip();
-};
+      g.drawString(line.trim(),x+36,y+54+lineY*8);
+  };
   
-Bangle.loadWidgets();
-//g.clear();
-Bangle.drawWidgets();
-drawPage(0);
-
-let swipeListenerDt = function(dirLeftRight, dirUpDown){
-    selected = 0;
-    oldselected=-1;
-    if(settings.swipeExit && dirLeftRight==1) returnToClock();
-    if (dirUpDown==-1||dirLeftRight==-1){
-        ++page; if (page>maxPage) page=0;
-        drawPage(page);
-    } else if (dirUpDown==1||(dirLeftRight==1 && !settings.swipeExit)){
-        --page; if (page<0) page=maxPage;
-        drawPage(page);
-    }
-};
-Bangle.on("swipe",swipeListenerDt);
-
-let isTouched = function(p,n){
-    if (n<0 || n>3) return false;
-    let x1 = (n%2)*72+XOFF;  let y1 =  n>1?72+YOFF:YOFF;
-    let x2 = x1+71; let y2 = y1+81;
-    return (p.x>x1 && p.y>y1 && p.x<x2 && p.y<y2);
-};
-
-let touchListenerDt = function(_,p){
-    let i;
-    for (i=0;i<4;i++){
-        if((page*4+i)<Napps){
-            if (isTouched(p,i)) {
-                drawIcon(page,i,true && !settings.direct);
-                if (selected>=0 || settings.direct) {
-                    if (selected!=i && !settings.direct){
-                        drawIcon(page,selected,false);
-                    } else {
-                        load(apps[page*4+i].src);
-                    }
-                }
-                selected=i;
-                break;
-            }
-        }
-    }
-    if ((i==4 || (page*4+i)>Napps) && selected>=0) {
-        drawIcon(page,selected,false);
-        selected=-1;
-    }
-};
-Bangle.on("touch",touchListenerDt);
+  let drawPage = function(p){
+      g.reset();
+      g.clearRect(0,24,175,175);
+      let O = 88+YOFF/2-12*(Npages/2);
+      for (let j=0;j<Npages;j++){
+          let y = O+j*12;
+          g.setColor(g.theme.fg);
+          if (j==page) g.fillCircle(XOFF/2,y,4);
+          else g.drawCircle(XOFF/2,y,4);
+      }
+      for (let i=0;i<4;i++) {
+          if (!apps[p*4+i]) return i;
+          drawIcon(p,i,selected==i && !settings.direct);
+      }
+      g.flip();
+  };
+    
+  Bangle.loadWidgets();
+  //g.clear();
+  Bangle.drawWidgets();
+  drawPage(0);
+  
+  let swipeListenerDt = function(dirLeftRight, dirUpDown){
+      selected = 0;
+      oldselected=-1;
+      if(settings.swipeExit && dirLeftRight==1) returnToClock();
+      if (dirUpDown==-1||dirLeftRight==-1){
+          ++page; if (page>maxPage) page=0;
+          drawPage(page);
+      } else if (dirUpDown==1||(dirLeftRight==1 && !settings.swipeExit)){
+          --page; if (page<0) page=maxPage;
+          drawPage(page);
+      }
+  };
+  Bangle.on("swipe",swipeListenerDt);
+  
+  let isTouched = function(p,n){
+      if (n<0 || n>3) return false;
+      let x1 = (n%2)*72+XOFF;  let y1 =  n>1?72+YOFF:YOFF;
+      let x2 = x1+71; let y2 = y1+81;
+      return (p.x>x1 && p.y>y1 && p.x<x2 && p.y<y2);
+  };
+  
+  let touchListenerDt = function(_,p){
+      let i;
+      for (i=0;i<4;i++){
+          if((page*4+i)<Napps){
+              if (isTouched(p,i)) {
+                  drawIcon(page,i,true && !settings.direct);
+                  if (selected>=0 || settings.direct) {
+                      if (selected!=i && !settings.direct){
+                          drawIcon(page,selected,false);
+                      } else {
+                          load(apps[page*4+i].src);
+                      }
+                  }
+                  selected=i;
+                  break;
+              }
+          }
+      }
+      if ((i==4 || (page*4+i)>Napps) && selected>=0) {
+          drawIcon(page,selected,false);
+          selected=-1;
+      }
+  };
+  Bangle.on("touch",touchListenerDt);
+    
+  const returnToClock = function() {
+    Bangle.setUI();
+    clearWatch(buttonWatch);
+    delete buttonWatch;
+    clearTimeout(timeoutToClock);
+    delete timeoutToClock;
+    delete s;
+    delete a;
+    delete n;
+    delete Napps;
+    delete Npages;
+    delete maxPage;
+    delete selected;
+    delete oldselected;
+    delete page;
+    delete XOFF;
+    delete YOFF;
+    delete x;
+    delete y;
+    delete txt;
+    delete lineY;
+    delete line;
+    delete c;
+    delete O;
+    delete x1;
+    delete x2;
+    delete i;
+    delete drawIcon;
+    delete drawPage;
+    delete isTouched;
+    Bangle.removeListener("swipe", swipeListenerDt);
+    delete swipeListenerDt;
+    Bangle.removeListener("touch", touchListenerDt);
+    delete touchListenerDt;
+    var apps = [];
+    delete apps;
+    delete returnToClock;
+    delete settings;
+    setTimeout(eval, 0, s.read(".bootcde"));
+  };
   
-const returnToClock = function() {
-  Bangle.setUI();
-  clearWatch(buttonWatch);
-  delete s;
-  delete a;
-  delete n;
-  delete Napps;
-  delete Npages;
-  delete maxPage;
-  delete selected;
-  delete oldselected;
-  delete page;
-  delete XOFF;
-  delete YOFF;
-  delete x;
-  delete y;
-  delete txt;
-  delete lineY;
-  delete line;
-  delete c;
-  delete O;
-  delete x1;
-  delete x2;
-  delete i;
-  delete drawIcon;
-  delete drawPage;
-  delete isTouched;
-  Bangle.removeListener("swipe", swipeListenerDt);
-  delete swipeListenerDt;
-  Bangle.removeListener("touch", touchListenerDt);
-  delete touchListenerDt;
-  var apps = [];
-  delete apps;
-  delete returnToClock;
-  delete settings;
-  setTimeout(eval, 0, s.read(".bootcde"));
-};
-
 } // end of app scope
diff --git a/apps/dtlaunch/settings-b2.js b/apps/dtlaunch/settings-b2.js
index fac9c0fff..315974c77 100644
--- a/apps/dtlaunch/settings-b2.js
+++ b/apps/dtlaunch/settings-b2.js
@@ -6,50 +6,63 @@
     showLaunchers: true,
     direct: false,
     oneClickExit:false,
-    swipeExit: false
+    swipeExit: false,
+    timeOut: "Off"
   }, require('Storage').readJSON(FILE, true) || {});
 
   function writeSettings() {
     require('Storage').writeJSON(FILE, settings);
   }
 
+  const timeOutChoices = [/*LANG*/"Off", "10s", "15s", "20s", "30s"];
+
   E.showMenu({
     "" : { "title" : "Desktop launcher" },
-    "< Back" : () => back(),
-    'Show clocks': {
+    /*LANG*/"< Back" : () => back(),
+    /*LANG*/'Show clocks': {
       value: settings.showClocks,
       onchange: v => {
         settings.showClocks = v;
         writeSettings();
       }
     },
-    'Show launchers': {
+    /*LANG*/'Show launchers': {
       value: settings.showLaunchers,
       onchange: v => {
         settings.showLaunchers = v;
         writeSettings();
       }
     },
-    'Direct launch': {
+    /*LANG*/'Direct launch': {
       value: settings.direct,
       onchange: v => {
         settings.direct = v;
         writeSettings();
       }
     },
-    'Swipe Exit': {
+    /*LANG*/'Swipe Exit': {
       value: settings.swipeExit,
       onchange: v => {
         settings.swipeExit = v;
         writeSettings();
       }
     },
-    'One click exit': {
+    /*LANG*/'One click exit': {
       value: settings.oneClickExit,
       onchange: v => {
         settings.oneClickExit = v;
         writeSettings();
       }
-    }
+    },
+    /*LANG*/'Time Out': {
+      value: timeOutChoices.indexOf(settings.timeOut),
+      min: 0,
+      max: timeOutChoices.length-1,
+      format: v => timeOutChoices[v],
+      onchange: m => {
+        settings.timeOut = m;
+        writeSettings();
+      }
+    },
   });
 })