diff --git a/conf/distro/sonomkr.conf b/conf/distro/sonomkr.conf
index 7a0e783..c513eb7 100644
--- a/conf/distro/sonomkr.conf
+++ b/conf/distro/sonomkr.conf
@@ -1,4 +1,4 @@
-require conf/distro/poky.conf  
+require conf/distro/poky.conf
 
 DISTRO = "sonomkr"
 DISTRO_NAME = "SonoMKR (Raspberry Pi Distribution for the SonoMKR Project)"
@@ -24,7 +24,7 @@ ENABLE_SPI_BUS_raspberrypi2 = "1"
 ENABLE_I2C_raspberrypi2 = "1"
 
 PREFERRED_VERSION_linux-raspberrypi = "4.4%"
-PREFERRED_VERSION_nodejs = "6%"
+#PREFERRED_VERSION_nodejs = "6%"
 
 KERNEL_DEVICETREE_append = " overlays/sonomkr-card-overlay.dtb \
 "
diff --git a/recipes-core/image/rpi-sonomkr-image.bb b/recipes-core/image/rpi-sonomkr-image.bb
index b071a6f..d4d2c67 100644
--- a/recipes-core/image/rpi-sonomkr-image.bb
+++ b/recipes-core/image/rpi-sonomkr-image.bb
@@ -2,8 +2,10 @@
 include recipes-core/images/rpi-hwup-image.bb
 
 IMAGE_FEATURES += "ssh-server-openssh "
- 
+
 IMAGE_INSTALL_append = " sonomkr-daemon"
+IMAGE_INSTALL_append = " sonomkr-api"
+IMAGE_INSTALL_append = " sonomkrctl"
 
 IMAGE_INSTALL_append = " gdbserver"
 IMAGE_INSTALL_append = " connman"
@@ -30,22 +32,31 @@ IMAGE_INSTALL_append = " alsa-utils"
 IMAGE_INSTALL_append = " util-linux"
 IMAGE_INSTALL_append = " spitools"
 IMAGE_INSTALL_append = " wget"
+IMAGE_INSTALL_append = " git"
+IMAGE_INSTALL_append = " gcc gcc-symlinks"
+IMAGE_INSTALL_append = " g++ g++-symlinks"
+IMAGE_INSTALL_append = " binutils binutils-symlinks"
+IMAGE_INSTALL_append = " rsync"
+IMAGE_INSTALL_append = " make"
 IMAGE_INSTALL_append = " vim"
 IMAGE_INSTALL_append = " libnewt"
 IMAGE_INSTALL_append = " parted"
 IMAGE_INSTALL_append = " i2c-tools"
-IMAGE_INSTALL_append = " binutils"
-IMAGE_INSTALL_append = " make"
+IMAGE_INSTALL_append = " nodejs"
+
 
 IMAGE_INSTALL_append = " python3"
 IMAGE_INSTALL_append = " python3-modules"
 IMAGE_INSTALL_append = " python3-numpy"
 IMAGE_INSTALL_append = " python3-dbus"
 IMAGE_INSTALL_append = " python3-pyserial"
+IMAGE_INSTALL_append = " python3-pip"
 IMAGE_INSTALL_append = " python-dbus"
 IMAGE_INSTALL_append = " python-modules"
 IMAGE_INSTALL_append = " python-smbus"
 IMAGE_INSTALL_append = " python-numeric"
+IMAGE_INSTALL_append = " python-pip"
+IMAGE_INSTALL_append = " python-distribute"
 
 IMAGE_INSTALL_append = " opkg"
 
diff --git a/recipes-sonomkr/sonomkr-api/sonomkr-api.bb b/recipes-sonomkr/sonomkr-api/sonomkr-api.bb
new file mode 100644
index 0000000..4c556c4
--- /dev/null
+++ b/recipes-sonomkr/sonomkr-api/sonomkr-api.bb
@@ -0,0 +1,31 @@
+SUMMARY = "The SonoMKR Project Software"
+DESCRIPTION = "This package builds and deploys The SonoMKR Project's main software."
+HOMEPAGE = "http://www.sonomkr.fr/"
+LICENSE = "AGPLv3"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=3e00ca6129dc8358315015204ab9fe15"
+
+DEPENDS += " nodejs dbus"
+RDEPENDS_${PN} += " nodejs dbus bash"
+
+SRCREV = "2bb3f2673184d7e3882d6d074da76bdc34e6aa1d"
+SRC_URI = "git://github.com/SonoMKR/sonomkr-api.git"
+
+S = "${WORKDIR}/git"
+
+inherit npm-base
+
+do_install() {
+	oe_runnpm install     # Installs dependencies defined in package.json
+
+    install -d ${D}/opt/sonomkr-api
+
+    cp -r ${S}/* ${D}/opt/sonomkr-api/
+    chmod -R 0755 ${D}/opt/sonomkr-api
+}
+
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INSANE_SKIP_${PN} += "staticdev"
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "/opt/sonomkr-api/*"
diff --git a/recipes-sonomkr/sonomkr-daemon/sonomkr-daemon.bb b/recipes-sonomkr/sonomkr-daemon/sonomkr-daemon.bb
index 11d2a6b..4054781 100644
--- a/recipes-sonomkr/sonomkr-daemon/sonomkr-daemon.bb
+++ b/recipes-sonomkr/sonomkr-daemon/sonomkr-daemon.bb
@@ -4,8 +4,6 @@ HOMEPAGE = "http://www.sonomkr.fr/"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=3e00ca6129dc8358315015204ab9fe15"
 
-FILESEXTRAPATHS_prepend := "/home/valoo/Qt/Projects:"
-
 PR = "r01"
 
 DEPENDS = "ncurses alsa-lib qtbase"
diff --git a/recipes-sonomkr/sonomkr-files/files/default.ini b/recipes-sonomkr/sonomkr-files/files/default.ini
index 1b661f9..8129e91 100644
--- a/recipes-sonomkr/sonomkr-files/files/default.ini
+++ b/recipes-sonomkr/sonomkr-files/files/default.ini
@@ -46,10 +46,6 @@ Password=XXX
 Server=XXX
 User=XXX
 
-[HttpServer]
-Active=false
-HttpPort=8888
-
 [Indicators]
 1\Channel=1
 1\Global=0
diff --git a/recipes-sonomkr/sonomkr-files/sonomkr-files.bb b/recipes-sonomkr/sonomkr-files/sonomkr-files.bb
index 2b4d709..84bf932 100644
--- a/recipes-sonomkr/sonomkr-files/sonomkr-files.bb
+++ b/recipes-sonomkr/sonomkr-files/sonomkr-files.bb
@@ -3,7 +3,6 @@ SECTION = "base"
 LICENSE = "AGPLv3"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/LICENCE;md5=b6b333b0d50db48b3e0b9e04b53801af"
 
-#SRC_URI = "file://SonoMKR 
 SRC_URI = "file://default.ini \
    file://sonomkr.conf \
    file://LICENCE \
@@ -15,13 +14,12 @@ do_install () {
    install -d ${D}${sysconfdir}/modules-load.d
    install -d ${D}${ROOT_HOME}/configs
    install -d ${D}$/media/card
-   
+
    #install -m 755 ${WORKDIR}/SonoMKR ${D}${bindir}/
    install -m 755 ${WORKDIR}/default.ini ${D}${ROOT_HOME}/configs/
    install -m 755 ${WORKDIR}/sonomkr.conf ${D}${sysconfdir}/modules-load.d/
 }
 
-#FILES_${PN} = "${bindir}/SonoMKR
 FILES_${PN} = "${sysconfdir}/modules-load.d/sonomkr.conf \
 	${ROOT_HOME}/configs/default.ini \
 "
diff --git a/recipes-sonomkr/sonomkrctl/sonomkrctl.bb b/recipes-sonomkr/sonomkrctl/sonomkrctl.bb
new file mode 100644
index 0000000..54782ab
--- /dev/null
+++ b/recipes-sonomkr/sonomkrctl/sonomkrctl.bb
@@ -0,0 +1,23 @@
+SUMMARY = "The SonoMKR CLI"
+DESCRIPTION = "This package builds and deploys The SonoMKR Project's CLI software."
+HOMEPAGE = "http://www.sonomkr.fr/"
+LICENSE = "AGPLv3"
+LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSE;md5=3e00ca6129dc8358315015204ab9fe15"
+
+RDEPENDS = "python"
+
+SRCREV = "5628faef223feefc804c547492ee35f297ff7b5c"
+SRC_URI = "git://github.com/SonoMKR/sonomkrctl.git"
+
+S = "${WORKDIR}/git"
+
+do_install () {
+   install -d ${D}${bindir}
+
+   install -m 755 ${S}/sonomkrctl ${D}${bindir}/
+}
+
+FILES_${PN} = "${bindir}/sonomkrctl \
+"
+
+INHIBIT_PACKAGE_STRIP = "1"
\ No newline at end of file