diff --git a/.gitignore b/.gitignore
index 262aeca7958fd03181a33ae0b4d8051bfdd0f85f..9d8a84f9dca8fb86434f142401c5b2038678ca6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,10 +47,9 @@ src/nw/cesium
 tmp
 
 package-lock.json
-src/nw/yarn.lock
 src/nw/swiftshader/libEGL.so
 src/nw/swiftshader/libGLESv2.so
 
 downloads
 
-src/nw/yarn.lock
\ No newline at end of file
+src/nw/yarn.lock
diff --git a/arch/linux/.directory b/arch/linux/.directory
new file mode 100644
index 0000000000000000000000000000000000000000..70d45dce179abfdf16589328e35c0342ec989708
--- /dev/null
+++ b/arch/linux/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2019,1,2,16,41,57
+Version=3
+ViewMode=1
diff --git a/arch/linux/build-deb.sh b/arch/linux/build-deb.sh
index 22646fe7c0cc870efa7248eb39938e28672b5cf8..a4c50e9c3773f32ca1c1325817b9fed250d35b2a 100644
--- a/arch/linux/build-deb.sh
+++ b/arch/linux/build-deb.sh
@@ -10,7 +10,7 @@ CESIUM_TAG=
 ADDON_VERSION=48
 NW_VERSION=0.35.3
 NW_RELEASE="v${NW_VERSION}"
-NW="nwjs-sdk-${NW_RELEASE}-linux-x64"
+NW="nwjs-${NW_RELEASE}-linux-x64"
 NW_GZ="${NW}.tar.gz"
 
 # Folders
diff --git a/arch/linux/package/DEBIAN/control b/arch/linux/package/DEBIAN/control
index f663d834d6f970717c3dc6d7d68ef7ef5f9c6352..2894c798a431e77d9be19b9e12791a5cbb3703ab 100644
--- a/arch/linux/package/DEBIAN/control
+++ b/arch/linux/package/DEBIAN/control
@@ -4,7 +4,6 @@ Section: misc
 Priority: optional
 Architecture: all
 Installed-Size: 235351
-License: AGPL-3+
 Maintainer: Duniter team
 Description: Cesium Wallet for Ğ1 currency
  Cesium is a wallet (client-software) for Ğ1, a libre currency.
diff --git a/arch/osx/bootstrap.sh b/arch/osx/bootstrap.sh
new file mode 100644
index 0000000000000000000000000000000000000000..b2a874495bf99af946a7283a898f33404f9b81fd
--- /dev/null
+++ b/arch/osx/bootstrap.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Yarn
+curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
+echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
+
+# System tools
+apt-get update
+apt-get install --yes git curl yarn python-minimal zip
+
+# User installation
+sudo su vagrant -c "bash /vagrant/user-bootstrap.sh"
diff --git a/arch/osx/user-bootstrap.sh b/arch/osx/user-bootstrap.sh
new file mode 100644
index 0000000000000000000000000000000000000000..38df75d12426297d394d40c3113496de092d6718
--- /dev/null
+++ b/arch/osx/user-bootstrap.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# NVM
+curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.1/install.sh | bash
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+
+# Node.js
+nvm install 6
+
+# node-pre-gyp
+npm install -g nw-gyp node-pre-gyp
diff --git a/install.sh b/install.sh
index f0f65374dfb75ba91b89aa39d1385680d62efe0e..34dc7ff3b8bb32f3bb66d52d384c649c3fe7dfdb 100755
--- a/install.sh
+++ b/install.sh
@@ -51,12 +51,12 @@ then
   rmdir nw
 
   cd $ROOT_DIR/src/nw
-  npm install
+  yarn
 
 # Check NW version
 else
   cd ${ROOT_DIR}/src/nw
-  npm install
+  yarn
 
   NW_ACTUAL_VERSION=`./nw --version | grep nwjs | awk '{print $2}'`
   echo "Using Chromium version: ${NW_ACTUAL_VERSION}"