diff --git a/apps/hidcam/ChangeLog b/apps/hidcam/ChangeLog
index 5560f00bc..665c0df6e 100644
--- a/apps/hidcam/ChangeLog
+++ b/apps/hidcam/ChangeLog
@@ -1 +1 @@
-0.01: New App!
+0.01: Init
diff --git a/apps/hidcam/add_to_apps.json b/apps/hidcam/add_to_apps.json
deleted file mode 100644
index ca75a7bd8..000000000
--- a/apps/hidcam/add_to_apps.json
+++ /dev/null
@@ -1,13 +0,0 @@
-// Create an entry in apps.json as follows:
-{ "id": "7chname",
-  "name": "My app's human readable name",
-  "shortName":"Short Name",
-  "icon": "app.png",
-  "version":"0.01",
-  "description": "A detailed description of my great app",
-  "tags": "",
-  "storage": [
-    {"name":"7chname.app.js","url":"app.js"},
-    {"name":"7chname.img","url":"app-icon.js","evaluate":true}
-  ]
-}
diff --git a/apps/hidcam/app-icon.js b/apps/hidcam/app-icon.js
index 49232b838..aa9d5e194 100644
--- a/apps/hidcam/app-icon.js
+++ b/apps/hidcam/app-icon.js
@@ -1 +1 @@
-require("heatshrink").decompress(atob("mEwwJC/AH4A/AH4AgA=="))
+E.toArrayBuffer(atob("MDCEAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxERERERETMzMzMzMzMzMzMzMzMzMzMzMRERERERERMzMzMzMzMzMzMzMzMzMzMzMREREREREREzMzMzMzMzMzMzMzMAAAAzEREREREREREzMzMzMzMzMzMzMzMAAAAxERERERERERETMzMzMzMzMzMzMxERERERERERERERERERERERETMzMzMzMRERERERERERERERERERERERERMzMzMzEREREREREREAAAAAEREREREREREzMzMzEREREREREQAAAAAAABERESIiIREzMzMzEREREREREAAAAAAAAAERESIiIREzMzMzEREREREQAAAKqqqgAAABESIiIREzMzMzEREREREQAAqqqqqqoAABESIiIREzMzMzEREREREAAKqqqqqqqgAAEREREREzMzMzERERERAACqqqqqqqqqAAAREREREzMzMzERERERAAqqqiIiIqqqoAAREREREzMzMzqqqqqgAAqqoiIiIiKqoAAKqqqqozMzMzqqqqqgAKqqIiIiIiKqqgAKqqqqozMzMzqqqqqgAKqqIiqqqiKqqgAKqqqqozMzMzqqqqqgAKqqqqqqqqqqqgAKqqqqozMzMzqqqqqgAKqqqqqqqqqqqgAKqqqqozMzMzqqqqqgAKqqqqqqqqqqqgAKqqqqozMzMzqqqqqgAKqqqqqqqqqqqgAKqqqqozMzMzqqqqqgAAqqqqqqqqqqoAAKqqqqozMzMzqqqqqqAAqqqqqqqqqqoACqqqqqozMzMzqqqqqqAACqqqqqqqqqAACqqqqqozMzMzqqqqqqoAAKqqqqqqqgAAqqqqqqozMzMzqqqqqqoAAAqqqqqqoAAAqqqqqqozMzMzqqqqqqqgAAAKqqqgAAAKqqqqqqozMzMzqqqqqqqqAAAAAAAAAACqqqqqqqozMzMzqqqqqqqqqgAAAAAAAKqqqqqqqqozMzMzqqqqqqqqqqoAAAAAqqqqqqqqqqozMzMzOqqqqqqqqqqqqqqqqqqqqqqqqqMzMzMzM6qqqqqqqqqqqqqqqqqqqqqqqjMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMw=="))
diff --git a/apps/hidcam/app.js b/apps/hidcam/app.js
deleted file mode 100644
index af367779a..000000000
--- a/apps/hidcam/app.js
+++ /dev/null
@@ -1,12 +0,0 @@
-// place your const, vars, functions or classes here
-
-// special function to handle display switch on
-Bangle.on('lcdPower', (on) => {
-  if (on) {
-    // call your app function here
-    // If you clear the screen, do Bangle.drawWidgets();
-  }
-});
-
-g.clear();
-// call your app function here
diff --git a/apps/hidcam/app.png b/apps/hidcam/app.png
index 582cb2e08..3f631a0d8 100644
Binary files a/apps/hidcam/app.png and b/apps/hidcam/app.png differ
diff --git a/apps/hidcam/hidcam.app.js b/apps/hidcam/hidcam.app.js
new file mode 100644
index 000000000..6a4150673
--- /dev/null
+++ b/apps/hidcam/hidcam.app.js
@@ -0,0 +1,28 @@
+var controls = require("ble_hid_controls");
+var storage = require('Storage');
+
+const settings = storage.readJSON('setting.json',1) || { HID: false };
+
+g.clear();
+E.showMessage('BTN2 to trigger','camTrigger');
+Bangle.loadWidgets();
+Bangle.drawWidgets();
+
+if (settings.HID) {
+  NRF.setServices(undefined, { hid : controls.report });
+  shotTrigger = function() {controls.volumeUp();};
+} else {
+  E.showMessage('HID disabled');
+  setTimeout(load, 1000);
+}
+
+setWatch(function(e){
+  E.showMessage('capture');
+  Bangle.beep();
+  shotTrigger();
+  set.Timeout(load,1000);
+  g.clear();
+  Bangle.loadWidgets();
+  Bangle.drawWidgets();
+  E.showMessage('BTN2 to trigger','camTrigger');
+},BTN2,{ repeat:true, edge:'falling' });
diff --git a/apps/hidcam/hidcam.app.json b/apps/hidcam/hidcam.app.json
new file mode 100644
index 000000000..df35404e4
--- /dev/null
+++ b/apps/hidcam/hidcam.app.json
@@ -0,0 +1,13 @@
+// Create an entry in apps.json as follows:
+{ "id": "hidcam",
+  "name": "HID camera shutter",
+  "shortName":"HID cam",
+  "icon": "app.png",
+  "version":"0.01",
+  "description": "Enable HID, connect to your phone, start your camera and trigger the shot on your Bangle",
+  "tags": "tools",
+  "storage": [
+    {"name":"hidcam.app.js","url":"hidcam.app.js"},
+    {"name":"hidcam.img","url":"app-icon.js","evaluate":true}
+  ],
+}