chore(usb): add kboot-firmware-upgrade script

2019-07-31 06:11:29 +02:00
78 changed files with 10743 additions and 8716 deletions
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-12.0.0
+10.11.0
--- a/2
+++ b/2
@@ -6,5 +6,3 @@ Before submitting a new issue, make sure to do the following:
 3. Use Agent to update to the latest firmware:
   https://github.com/UltimateHackingKeyboard/firmware/releases/latest
 4. Try to reproduce the issue, and only report it if it still persists.
-
-`npm audit` related issues will be closed due to https://github.com/UltimateHackingKeyboard/agent/blob/master/NPM_UPDATES.md
--- a/NPM_UPDATES.md
+++ b/NPM_UPDATES.md
@@ -1,8 +0,0 @@
-We get requests from time to time to update our NPM dependencies because they contain vulnerabilities according to `npm audit`. Such issues will be closed without further consideration due to the following reasons:
-
-1. Usually, the affected packages are not runtime dependencies of Agent, but devDependencies which are only needed for developing Agent.
-2. Often times, 3rd party packages are affected by vulnerabilities which we cannot fix.
-3. We can't just blindly update all of the packages because that'd likely break Agent as it has happened in the past. Each of the updates must be carefully tested, and we don't have the manpower to do it on a daily basis.
-4. Sometimes `npm audit` signals false vulnerabilities.
-
-We routinely update our dependencies on a best effort basis.
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ environment:
    secure: 3IebpEKmC39codi1wT6dXx8mql4/mCL1JzZ7lir7GQ5MWRnCxlED2OXbiKHHigDV
  CSC_LINK: c:\projects\uhk-agent\scripts\certs\windows-cert.p12
  matrix:
-    - nodejs_version: "12.0.0"
+    - nodejs_version: "10.11.0"

 cache:
  - node_modules -> package.json
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -15,11 +15,11 @@
  },
  "license": "GPL-3.0",
  "engines": {
-    "node": ">=12.0.0 <13.0.0",
-    "npm": ">=6.9.0 <7.0.0"
+    "node": ">=10.2.1 <11.0.0",
+    "npm": ">=6.4.0 <7.0.0"
  },
  "devDependencies": {
-    "@types/decompress": "4.2.3",
+    "@types/decompress": "4.2.0",
    "@types/electron-devtools-installer": "2.0.2",
    "@types/electron-settings": "3.0.0",
    "@types/file-saver": "0.0.1",
@@ -38,18 +38,18 @@
    "buffer": "5.0.6",
    "check-node-version": "^3.2.0",
    "copy-webpack-plugin": "5.0.0",
-    "copyfiles": "2.1.1",
+    "copyfiles": "^2.0.0",
    "core-js": "2.4.1",
    "cross-env": "5.0.5",
    "decompress": "4.2.0",
    "decompress-tarbz2": "4.1.1",
    "devtron": "1.4.0",
-    "electron": "5.0.9",
+    "electron": "4.2.8",
    "electron-builder": "20.34.0",
    "electron-debug": "1.5.0",
    "electron-devtools-installer": "2.2.3",
    "electron-log": "2.2.16",
-    "electron-rebuild": "1.8.6",
+    "electron-rebuild": "1.8.5",
    "electron-settings": "3.1.4",
    "electron-updater": "2.21.4",
    "exports-loader": "0.6.3",
@@ -64,7 +64,7 @@
    "jsonfile": "4.0.0",
    "lerna": "3.16.4",
    "lodash": "4.17.15",
-    "node-hid": "0.7.9",
+    "node-hid": "0.7.8",
    "npm-run-all": "4.0.2",
    "nrf-intel-hex": "1.3.0",
    "postcss-url": "8.0.0",
@@ -101,7 +101,6 @@
    "release": "node ./scripts/release.js",
    "clean": "lerna exec rimraf ./node_modules ./dist && rimraf ./node_modules ./dist ./tmp",
    "predeploy-gh-pages": "lerna run build:web --scope=uhk-web",
-    "deploy-gh-pages": "gh-pages -d packages/uhk-web/dist",
-    "convert-user-config-to-bin": "node -r ts-node/register ./packages/usb/user-config-json-to-bin.ts"
+    "deploy-gh-pages": "gh-pages -d packages/uhk-web/dist"
  }
 }
--- a/packages/kboot/package-lock.json
+++ b/packages/kboot/package-lock.json
@@ -24,16 +24,13 @@
 			}
 		},
 		"bindings": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-			"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-			"requires": {
-				"file-uri-to-path": "1.0.0"
-			}
+			"version": "1.3.1",
+			"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.3.1.tgz",
+			"integrity": "sha512-i47mqjF9UbjxJhxGf+pZ6kSxrnI3wBLlnGI2ArWJ4r0VrvDS7ZYXkprq/pLaBWYq4GM0r4zdHY+NNRqEMU7uew=="
 		},
 		"bl": {
 			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
+			"resolved": "http://registry.npmjs.org/bl/-/bl-1.2.2.tgz",
 			"integrity": "sha512-e8tQYnZodmebYDWGH7KMRvtzKXaJHx3BbilrgZCfvyLUYdKpK1t5PSPmpkny/SgiTSCnjfLW7v5rlONXVFkQEA==",
 			"requires": {
 				"readable-stream": "^2.3.5",
@@ -72,9 +69,9 @@
 			}
 		},
 		"chownr": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
-			"integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+			"integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
 		},
 		"code-point-at": {
 			"version": "1.1.0",
@@ -140,11 +137,6 @@
 			"resolved": "https://registry.npmjs.org/expand-template/-/expand-template-2.0.3.tgz",
 			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
 		},
-		"file-uri-to-path": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
-		},
 		"fs-constants": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
@@ -181,9 +173,9 @@
 			"integrity": "sha512-dDlJhYk8BAmH1HDncTjCt6xOm2+kT+MxGhRKB+mUoF8nocDzPAgZPEWTRI9QgkGvbDkbJgCqyxweGlIV0yhbUQ=="
 		},
 		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 		},
 		"ini": {
 			"version": "1.3.5",
@@ -210,12 +202,12 @@
 		},
 		"minimist": {
 			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+			"resolved": "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
 			"integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
 		},
 		"mkdirp": {
 			"version": "0.5.1",
-			"resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+			"resolved": "http://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
 			"integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
 			"requires": {
 				"minimist": "0.0.8"
@@ -223,7 +215,7 @@
 			"dependencies": {
 				"minimist": {
 					"version": "0.0.8",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+					"resolved": "http://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
 					"integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
 				}
 			}
@@ -234,9 +226,9 @@
 			"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
 		},
 		"nan": {
-			"version": "2.14.0",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
-			"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
+			"version": "2.12.1",
+			"resolved": "https://registry.npmjs.org/nan/-/nan-2.12.1.tgz",
+			"integrity": "sha512-JY7V6lRkStKcKTvHO5NVSQRv+RV+FIL5pvDoLiAtSL9pKlC5x9PKQcZDsq7m4FO4d57mkhC6Z+QhAh3Jdk5JFw=="
 		},
 		"napi-build-utils": {
 			"version": "1.0.1",
@@ -244,21 +236,21 @@
 			"integrity": "sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA=="
 		},
 		"node-abi": {
-			"version": "2.11.0",
-			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.11.0.tgz",
-			"integrity": "sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==",
+			"version": "2.5.1",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.5.1.tgz",
+			"integrity": "sha512-oDbFc7vCFx0RWWCweTer3hFm1u+e60N5FtGnmRV6QqvgATGFH/XRR6vqWIeBVosCYCqt6YdIr2L0exLZuEdVcQ==",
 			"requires": {
 				"semver": "^5.4.1"
 			}
 		},
 		"node-hid": {
-			"version": "0.7.9",
-			"resolved": "https://registry.npmjs.org/node-hid/-/node-hid-0.7.9.tgz",
-			"integrity": "sha512-vJnonTqmq3frCyTumJqG4g2IZcny3ynkfmbfDfQ90P3ZhRzcWYS/Um1ux6HFmAxmkaQnrZqIYHcGpL7kdqY8jA==",
+			"version": "0.7.4",
+			"resolved": "https://registry.npmjs.org/node-hid/-/node-hid-0.7.4.tgz",
+			"integrity": "sha512-gvgNDPoszObn7avIDYMUvVv1T0xQB4/CZFJWckra/LXAc0qHYho4M1LCnCKlLIocL2R5/3qGv0J4AjRMdwgjxg==",
 			"requires": {
-				"bindings": "^1.5.0",
-				"nan": "^2.13.2",
-				"prebuild-install": "^5.3.0"
+				"bindings": "^1.3.0",
+				"nan": "^2.10.0",
+				"prebuild-install": "^5.2.1"
 			}
 		},
 		"noop-logger": {
@@ -297,13 +289,13 @@
 		},
 		"os-homedir": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+			"resolved": "http://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
 			"integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M="
 		},
 		"prebuild-install": {
-			"version": "5.3.0",
-			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.3.0.tgz",
-			"integrity": "sha512-aaLVANlj4HgZweKttFNUVNRxDukytuIuxeK2boIMHjagNJCiVKWFsKF4tCE3ql3GbrD2tExPQ7/pwtEJcHNZeg==",
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-5.2.2.tgz",
+			"integrity": "sha512-4e8VJnP3zJdZv/uP0eNWmr2r9urp4NECw7Mt1OSAi3rcLrbBRxGiAkfUFtre2MhQ5wfREAjRV+K1gubvs/GPsA==",
 			"requires": {
 				"detect-libc": "^1.0.3",
 				"expand-template": "^2.0.3",
@@ -311,7 +303,7 @@
 				"minimist": "^1.2.0",
 				"mkdirp": "^0.5.1",
 				"napi-build-utils": "^1.0.1",
-				"node-abi": "^2.7.0",
+				"node-abi": "^2.2.0",
 				"noop-logger": "^0.1.1",
 				"npmlog": "^4.0.1",
 				"os-homedir": "^1.0.1",
@@ -324,9 +316,9 @@
 			}
 		},
 		"process-nextick-args": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+			"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
 		},
 		"pump": {
 			"version": "2.0.1",
@@ -350,7 +342,7 @@
 		},
 		"readable-stream": {
 			"version": "2.3.6",
-			"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+			"resolved": "http://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
 			"integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
 			"requires": {
 				"core-util-is": "~1.0.0",
@@ -368,9 +360,9 @@
 			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
 		"semver": {
-			"version": "5.7.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+			"version": "5.6.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.6.0.tgz",
+			"integrity": "sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg=="
 		},
 		"set-blocking": {
 			"version": "2.0.0",
@@ -399,7 +391,7 @@
 		},
 		"string-width": {
 			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+			"resolved": "http://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
 			"integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
 			"requires": {
 				"code-point-at": "^1.0.0",
@@ -409,7 +401,7 @@
 		},
 		"string_decoder": {
 			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+			"resolved": "http://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
 			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 			"requires": {
 				"safe-buffer": "~5.1.0"
@@ -417,7 +409,7 @@
 		},
 		"strip-ansi": {
 			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+			"resolved": "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
 			"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
 			"requires": {
 				"ansi-regex": "^2.0.0"
@@ -524,9 +516,9 @@
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
 		},
 		"xtend": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 		}
 	}
 }
--- a/packages/kboot/package.json
+++ b/packages/kboot/package.json
@@ -9,11 +9,15 @@
    "url": "git@github.com:UltimateHackingKeyboard/agent.git"
  },
  "license": "GPL-3.0",
+  "engines": {
+    "node": ">=8.12.0 <9.0.0",
+    "npm": ">=6.4.1 <7.0.0"
+  },
  "dependencies": {
    "debug": "^4.1.1",
    "byte-data": "^16.0.3",
    "tslib": "^1.10.0",
-    "node-hid": ">= 0.7.9"
+    "node-hid": ">= 0.7.3"
  },
  "peer-dependencies": {},
  "scripts": {
--- a/packages/uhk-agent/package-lock.json
+++ b/packages/uhk-agent/package-lock.json
@@ -32,9 +32,9 @@
 			}
 		},
 		"base64-js": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-			"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+			"integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg="
 		},
 		"bindings": {
 			"version": "1.5.0",
@@ -54,42 +54,24 @@
 			}
 		},
 		"buffer": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.0.tgz",
-			"integrity": "sha512-Xpgy0IwHK2N01ncykXTy6FpCWuM+CJSHoPVBLyNqyrWxsedpLvwsYUhf0ME3WRFNUhos0dMamz9cOS/xRDtU5g==",
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz",
+			"integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=",
 			"requires": {
-				"base64-js": "^1.0.2",
-				"ieee754": "^1.1.4"
+				"base64-js": "0.0.8",
+				"ieee754": "^1.1.4",
+				"isarray": "^1.0.0"
 			}
 		},
-		"buffer-alloc": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-			"integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-			"requires": {
-				"buffer-alloc-unsafe": "^1.1.0",
-				"buffer-fill": "^1.0.0"
-			}
-		},
-		"buffer-alloc-unsafe": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
-		},
 		"buffer-crc32": {
 			"version": "0.2.13",
 			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
 			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
 		},
-		"buffer-fill": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-			"integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
-		},
 		"chownr": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
-			"integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+			"integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
 		},
 		"code-point-at": {
 			"version": "1.1.0",
@@ -249,9 +231,9 @@
 			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
 		},
 		"fd-slicer": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-			"integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+			"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
 			"requires": {
 				"pend": "~1.2.0"
 			}
@@ -285,11 +267,6 @@
 				}
 			}
 		},
-		"fs-constants": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
-		},
 		"gauge": {
 			"version": "2.7.4",
 			"resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
@@ -320,9 +297,9 @@
 			"integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
 		},
 		"graceful-fs": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz",
-			"integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="
+			"version": "4.1.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+			"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
 		},
 		"graceful-readlink": {
 			"version": "1.0.1",
@@ -335,14 +312,14 @@
 			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
 		},
 		"ieee754": {
-			"version": "1.1.13",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-			"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz",
+			"integrity": "sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg=="
 		},
 		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 		},
 		"ini": {
 			"version": "1.3.5",
@@ -373,9 +350,9 @@
 			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 		},
 		"make-dir": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-			"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz",
+			"integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==",
 			"requires": {
 				"pify": "^3.0.0"
 			},
@@ -423,17 +400,17 @@
 			"integrity": "sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA=="
 		},
 		"node-abi": {
-			"version": "2.11.0",
-			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.11.0.tgz",
-			"integrity": "sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==",
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.8.0.tgz",
+			"integrity": "sha512-1/aa2clS0pue0HjckL62CsbhWWU35HARvBDXcJtYKbYR7LnIutmpxmXbuDMV9kEviD2lP/wACOgWmmwljghHyQ==",
 			"requires": {
 				"semver": "^5.4.1"
 			}
 		},
 		"node-hid": {
-			"version": "0.7.9",
-			"resolved": "https://registry.npmjs.org/node-hid/-/node-hid-0.7.9.tgz",
-			"integrity": "sha512-vJnonTqmq3frCyTumJqG4g2IZcny3ynkfmbfDfQ90P3ZhRzcWYS/Um1ux6HFmAxmkaQnrZqIYHcGpL7kdqY8jA==",
+			"version": "0.7.8",
+			"resolved": "https://registry.npmjs.org/node-hid/-/node-hid-0.7.8.tgz",
+			"integrity": "sha512-79Z9hw/pqIDp0kxvb353ivGgslo4i0hYQTcCqfRFxIJSO2gF9VtPla5uQY/9jTcDlON5O5YaqxbdH+8bs+m+1Q==",
 			"requires": {
 				"bindings": "^1.5.0",
 				"nan": "^2.13.2",
@@ -531,9 +508,9 @@
 			}
 		},
 		"process-nextick-args": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+			"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
 		},
 		"pump": {
 			"version": "2.0.1",
@@ -567,19 +544,12 @@
 				"safe-buffer": "~5.1.1",
 				"string_decoder": "~1.1.1",
 				"util-deprecate": "~1.0.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				}
 			}
 		},
 		"safe-buffer": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-			"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
 		},
 		"seek-bzip": {
 			"version": "1.0.5",
@@ -590,9 +560,9 @@
 			}
 		},
 		"semver": {
-			"version": "5.7.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+			"version": "5.7.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+			"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
 		},
 		"set-blocking": {
 			"version": "2.0.0",
@@ -635,13 +605,6 @@
 			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 			"requires": {
 				"safe-buffer": "~5.1.0"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				}
 			}
 		},
 		"strip-ansi": {
@@ -693,16 +656,13 @@
 			}
 		},
 		"tar-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
-			"integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+			"version": "1.5.5",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
+			"integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
 			"requires": {
 				"bl": "^1.0.0",
-				"buffer-alloc": "^1.2.0",
 				"end-of-stream": "^1.0.0",
-				"fs-constants": "^1.0.0",
-				"readable-stream": "^2.3.0",
-				"to-buffer": "^1.1.1",
+				"readable-stream": "^2.0.0",
 				"xtend": "^4.0.0"
 			}
 		},
@@ -738,11 +698,6 @@
 				"os-tmpdir": "~1.0.2"
 			}
 		},
-		"to-buffer": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-			"integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
-		},
 		"tslib": {
 			"version": "1.10.0",
 			"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
@@ -762,12 +717,12 @@
 			"integrity": "sha1-XAgOXWYcu+OCWdLnCjxyU+hziB0="
 		},
 		"unbzip2-stream": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
-			"integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz",
+			"integrity": "sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==",
 			"requires": {
-				"buffer": "^5.2.1",
-				"through": "^2.3.8"
+				"buffer": "^3.0.1",
+				"through": "^2.3.6"
 			}
 		},
 		"util-deprecate": {
@@ -794,17 +749,17 @@
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
 		},
 		"xtend": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 		},
 		"yauzl": {
-			"version": "2.10.0",
-			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-			"integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+			"version": "2.9.1",
+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
+			"integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
 			"requires": {
 				"buffer-crc32": "~0.2.3",
-				"fd-slicer": "~1.1.0"
+				"fd-slicer": "~1.0.1"
 			}
 		}
 	}
--- a/packages/uhk-agent/package.json
+++ b/packages/uhk-agent/package.json
@@ -17,7 +17,7 @@
    "command-line-args": "4.0.7",
    "decompress": "4.2.0",
    "decompress-bzip2": "4.0.0",
-    "node-hid": "0.7.9",
+    "node-hid": "0.7.8",
    "sudo-prompt": "7.0.0",
    "tmp": "0.0.33",
    "tslib": "1.10.0",
--- a/packages/uhk-agent/src/electron-menu.ts
+++ b/packages/uhk-agent/src/electron-menu.ts
@@ -1,4 +1,4 @@
-import { app, BrowserWindow, Menu, MenuItemConstructorOptions, systemPreferences } from 'electron';
+import { app, BrowserWindow, Menu, systemPreferences } from 'electron';
 import * as isDev from 'electron-is-dev';

 export const setMenu = (win: BrowserWindow): void => {
@@ -8,7 +8,7 @@ export const setMenu = (win: BrowserWindow): void => {
        return;
    }

-    const template: MenuItemConstructorOptions[] = [
+    const template = [
        {
            label: app.getName(),
            submenu: [
--- a/packages/uhk-agent/src/package.json
+++ b/packages/uhk-agent/src/package.json
@@ -14,6 +14,6 @@
    "npm": ">=5.1.0 <6.0.0"
  },
  "dependencies": {
-    "node-hid": "0.7.9"
+    "node-hid": "0.7.8"
  }
 }
--- a/packages/uhk-common/src/config-serializer/config-items/key-action/mouse-action.ts
+++ b/packages/uhk-common/src/config-serializer/config-items/key-action/mouse-action.ts
@@ -15,12 +15,7 @@ export enum MouseActionParam {
    scrollLeft,
    scrollRight,
    accelerate,
-    decelerate,
-    button4,
-    button5,
-    button6,
-    button7,
-    button8
+    decelerate
 }

 export class MouseAction extends KeyAction {
--- a/packages/uhk-common/src/models/hardware-module-info.ts
+++ b/packages/uhk-common/src/models/hardware-module-info.ts
@@ -1,4 +1,4 @@
-export interface LeftModuleInfo {
+export interface HardwareModuleInfo {
    firmwareVersion?: string;
    moduleProtocolVersion?: string;
 }
--- a/packages/uhk-common/src/models/hardware-modules.ts
+++ b/packages/uhk-common/src/models/hardware-modules.ts
@@ -1,7 +1,6 @@
-import { LeftModuleInfo } from './left-module-info';
-import { RightModuleInfo } from './right-module-info';
+import { HardwareModuleInfo } from './hardware-module-info';

 export interface HardwareModules {
-    leftModuleInfo?: LeftModuleInfo;
-    rightModuleInfo?: RightModuleInfo;
+    leftModuleInfo?: HardwareModuleInfo;
+    rightModuleInfo?: HardwareModuleInfo;
 }
--- a/packages/uhk-common/src/models/index.ts
+++ b/packages/uhk-common/src/models/index.ts
@@ -6,9 +6,8 @@ export * from './app-start-info';
 export * from './configuration-reply';
 export * from './version-information';
 export * from './device-connection-state';
-export * from './left-module-info';
 export * from './hardware-modules';
-export * from './right-module-info';
+export * from './hardware-module-info';
 export * from './save-user-configuration-data';
 export * from './udev-rules-info';
 export * from './update-firmware-data';
--- a/packages/uhk-common/src/models/right-module-info.ts
+++ b/packages/uhk-common/src/models/right-module-info.ts
@@ -1,7 +0,0 @@
-export interface RightModuleInfo {
-    deviceProtocolVersion?: string;
-    hardwareConfigVersion?: string;
-    firmwareVersion?: string;
-    moduleProtocolVersion?: string;
-    userConfigVersion?: string;
-}
--- a/packages/uhk-usb/package-lock.json
+++ b/packages/uhk-usb/package-lock.json
@@ -60,9 +60,9 @@
 			"integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
 		},
 		"chownr": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
-			"integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+			"integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
 		},
 		"code-point-at": {
 			"version": "1.1.0",
@@ -151,9 +151,9 @@
 			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
 		},
 		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 		},
 		"ini": {
 			"version": "1.3.5",
@@ -209,17 +209,17 @@
 			"integrity": "sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA=="
 		},
 		"node-abi": {
-			"version": "2.11.0",
-			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.11.0.tgz",
-			"integrity": "sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==",
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.8.0.tgz",
+			"integrity": "sha512-1/aa2clS0pue0HjckL62CsbhWWU35HARvBDXcJtYKbYR7LnIutmpxmXbuDMV9kEviD2lP/wACOgWmmwljghHyQ==",
 			"requires": {
 				"semver": "^5.4.1"
 			}
 		},
 		"node-hid": {
-			"version": "0.7.9",
-			"resolved": "https://registry.npmjs.org/node-hid/-/node-hid-0.7.9.tgz",
-			"integrity": "sha512-vJnonTqmq3frCyTumJqG4g2IZcny3ynkfmbfDfQ90P3ZhRzcWYS/Um1ux6HFmAxmkaQnrZqIYHcGpL7kdqY8jA==",
+			"version": "0.7.8",
+			"resolved": "https://registry.npmjs.org/node-hid/-/node-hid-0.7.8.tgz",
+			"integrity": "sha512-79Z9hw/pqIDp0kxvb353ivGgslo4i0hYQTcCqfRFxIJSO2gF9VtPla5uQY/9jTcDlON5O5YaqxbdH+8bs+m+1Q==",
 			"requires": {
 				"bindings": "^1.5.0",
 				"nan": "^2.13.2",
@@ -294,9 +294,9 @@
 			}
 		},
 		"process-nextick-args": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+			"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
 		},
 		"pump": {
 			"version": "2.0.1",
@@ -338,9 +338,9 @@
 			"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
 		},
 		"semver": {
-			"version": "5.7.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+			"version": "5.7.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+			"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
 		},
 		"set-blocking": {
 			"version": "2.0.0",
@@ -476,9 +476,9 @@
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
 		},
 		"xtend": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 		}
 	}
 }
--- a/packages/uhk-usb/package.json
+++ b/packages/uhk-usb/package.json
@@ -12,7 +12,7 @@
  },
  "dependencies": {
    "kboot": "0.0.0",
-    "node-hid": "0.7.9",
+    "node-hid": "0.7.8",
    "nrf-intel-hex": "1.3.0",
    "tslib": "1.10.0",
    "uhk-common": "1.0.0"
--- a/packages/uhk-usb/src/uhk-operations.ts
+++ b/packages/uhk-usb/src/uhk-operations.ts
@@ -1,4 +1,4 @@
-import { LeftModuleInfo, LogService, RightModuleInfo, UhkBuffer } from 'uhk-common';
+import { HardwareModuleInfo, LogService, UhkBuffer } from 'uhk-common';
 import { DataOption, KBoot, Properties, UsbPeripheral } from 'kboot';

 import {
@@ -248,7 +248,7 @@ export class UhkOperations {
        return false;
    }

-    public async getLeftModuleVersionInfo(): Promise<LeftModuleInfo> {
+    public async getLeftModuleVersionInfo(): Promise<HardwareModuleInfo> {
        try {
            this.logService.debug('[DeviceOperation] USB[T]: Read left module version information');

@@ -277,7 +277,7 @@ export class UhkOperations {
        };
    }

-    public async getRightModuleVersionInfo(): Promise<RightModuleInfo> {
+    public async getRightModuleVersionInfo(): Promise<HardwareModuleInfo> {
        this.logService.debug('[DeviceOperation] USB[T]: Read right module version information');

        const command = Buffer.from([UsbCommand.GetProperty, DevicePropertyIds.ProtocolVersions]);
@@ -287,11 +287,7 @@ export class UhkOperations {
        uhkBuffer.readUInt8();

        return {
-            firmwareVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`,
-            deviceProtocolVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`,
-            moduleProtocolVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`,
-            userConfigVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`,
-            hardwareConfigVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`
+            firmwareVersion: `${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}.${uhkBuffer.readUInt16()}`
        };
    }

--- a/packages/uhk-usb/src/util.ts
+++ b/packages/uhk-usb/src/util.ts
@@ -1,7 +1,7 @@
 import { Device, devices } from 'node-hid';
 import { readFile } from 'fs-extra';
 import { EOL } from 'os';
-import MemoryMap from 'nrf-intel-hex';
+import * as MemoryMap from 'nrf-intel-hex';
 import { LogService } from 'uhk-common';

 import { Constants, UsbCommand } from './constants';
--- a/packages/uhk-web/package-lock.json
+++ b/packages/uhk-web/package-lock.json
--- a/packages/uhk-web/package.json
+++ b/packages/uhk-web/package.json
@@ -19,28 +19,29 @@
  },
  "private": true,
  "devDependencies": {
-    "@angular/animations": "8.2.3",
-    "@angular-builders/custom-webpack": "8.1.0",
-    "@angular/cli": "8.2.1",
-    "@angular/common": "8.2.3",
-    "@angular/compiler": "8.2.3",
-    "@angular/compiler-cli": "8.2.3",
-    "@angular/core": "8.2.3",
-    "@angular-devkit/build-angular": "0.802.1",
-    "@angular-devkit/build-optimizer": "0.802.1",
-    "@angular-devkit/core": "8.2.1",
-    "@angular/forms": "8.2.3",
-    "@angular/language-service": "8.2.3",
-    "@angular/platform-browser": "8.2.3",
-    "@angular/platform-browser-dynamic": "8.2.3",
-    "@angular/router": "8.2.3",
-    "@ngtools/webpack": "8.2.1",
-    "@ngrx/effects": "8.2.0",
-    "@ngrx/router-store": "8.2.0",
-    "@ngrx/store": "8.2.0",
-    "@ngrx/store-devtools": "8.2.0",
+    "@angular/animations": "7.2.15",
+    "@angular-builders/custom-webpack": "7.3.1",
+    "@angular/cli": "7.3.9",
+    "@angular/common": "7.2.15",
+    "@angular/compiler": "7.2.15",
+    "@angular/compiler-cli": "7.2.15",
+    "@angular/core": "7.2.15",
+    "@angular-devkit/build-angular": "0.13.9",
+    "@angular-devkit/build-optimizer": "0.13.9",
+    "@angular-devkit/core": "7.3.9",
+    "@angular/forms": "7.2.15",
+    "@angular/http": "7.2.15",
+    "@angular/language-service": "7.2.15",
+    "@angular/platform-browser": "7.2.15",
+    "@angular/platform-browser-dynamic": "7.2.15",
+    "@angular/router": "7.2.15",
+    "@ngtools/webpack": "7.3.9",
+    "@ngrx/effects": "7.4.0",
+    "@ngrx/router-store": "7.4.0",
+    "@ngrx/store": "7.4.0",
+    "@ngrx/store-devtools": "7.4.0",
    "@ngrx/store-log-monitor": "3.0.2",
-    "angular-confirmation-popover": "4.2.1",
+    "angular-confirmation-popover": "4.2.0",
    "angular-notifier": "4.1.1",
    "bootstrap": "3.4.1",
    "codelyzer": "4.5.0",
@@ -55,18 +56,19 @@
    "karma-jasmine": "1.1.2",
    "karma-jasmine-html-reporter": "1.3.1",
    "ng2-dragula": "2.1.1",
-    "ng2-nouislider": "1.8.2",
-    "ngx-clipboard": "12.2.0",
-    "ngx-select-ex": "3.7.0",
-    "ngrx-store-freeze": "0.2.4",
-    "nouislider": "14.0.2",
+    "ng2-nouislider": "1.7.13",
+    "ngx-clipboard": "10.0.0",
+    "ngx-select-ex": "3.6.8",
+    "ngrx-store-freeze": "0.1.9",
+    "nouislider": "13.1.1",
    "protractor": "5.4.0",
-    "rxjs": "6.5.2",
+    "reselect": "3.0.1",
+    "rxjs": "6.4.0",
    "semver": "5.6.0",
    "ts-keycode-enum": "^1.0.6",
    "uhk-common": "1.0.0",
    "xml-loader": "1.2.1",
-    "zone.js": "0.10.0"
+    "zone.js": "0.8.26"
  },
  "dependencies": {
    "classlist.js": "1.1.20150312",
--- a/packages/uhk-web/src/app/components/agent/about/contributor-badge/contributor-badge.component.ts
+++ b/packages/uhk-web/src/app/components/agent/about/contributor-badge/contributor-badge.component.ts
@@ -1,7 +1,7 @@
-import { Component, Input, ViewChild, ElementRef, AfterViewInit } from '@angular/core';
+import { Component, Input, ViewChild, ElementRef, OnInit } from '@angular/core';
 import { Store } from '@ngrx/store';

-import { AppState } from '../../../../store';
+import { AppState } from '../../../../store/index';

 import { UHKContributor } from '../../../../models/uhk-contributor';

@@ -10,9 +10,9 @@ import { UHKContributor } from '../../../../models/uhk-contributor';
    templateUrl: './contributor-badge.component.html',
    styleUrls: ['./contributor-badge.component.scss']
 })
-export class ContributorBadgeComponent implements AfterViewInit {
+export class ContributorBadgeComponent implements OnInit {
    @Input() contributor: UHKContributor;
-    @ViewChild('badge', { static: false }) badge: ElementRef;
+    @ViewChild('badge') badge: ElementRef;

    get name(): string {
        return this.contributor.login;
@@ -29,7 +29,7 @@ export class ContributorBadgeComponent implements AfterViewInit {
    constructor(private store: Store<AppState>) {
    }

-    ngAfterViewInit(): void {
+    ngOnInit(): void {
        (this.badge.nativeElement as HTMLImageElement).src = URL.createObjectURL(this.contributor.avatar);
    }
 }
--- a/packages/uhk-web/src/app/components/auto-grow-input/auto-grow-input.component.ts
+++ b/packages/uhk-web/src/app/components/auto-grow-input/auto-grow-input.component.ts
@@ -30,7 +30,7 @@ export class AutoGrowInputComponent implements ControlValueAccessor {
    @Input() maxParentWidthPercent = 1;
    @Input() css: string;

-    @ViewChild('inputControl', { static: true }) inputControl: ElementRef;
+    @ViewChild('inputControl') inputControl: ElementRef;

    disabled: boolean;

--- a/packages/uhk-web/src/app/components/device/configuration/device-configuration.component.html
+++ b/packages/uhk-web/src/app/components/device/configuration/device-configuration.component.html
@@ -21,7 +21,7 @@
    <li>
        <button class="btn btn-danger"
                mwlConfirmationPopover
-                popoverTitle="Are you sure?"
+                title="Are you sure?"
                placement="bottom"
                confirmText="Yes"
                cancelText="No"
--- a/packages/uhk-web/src/app/components/device/firmware/device-firmware.component.html
+++ b/packages/uhk-web/src/app/components/device/firmware/device-firmware.component.html
@@ -27,7 +27,7 @@
                             label="Choose firmware file and flash it"></file-upload>
            </p>

-            <div *ngIf="firmwareUpgradeFailed"
+            <div *ngIf="firmwareUpgradeFailed$ | async"
                 class="alert alert-danger"
                 role="alert">
                <p>Firmware update failed. Disconnect every USB device from your computer (including USB hubs, KVM switches, USB dongles, and everything else), then connect only your UHK and retry.</p>
@@ -35,7 +35,7 @@
                <p>If you've tried the above and the update still keeps failing, please <a class="link-github" [href]="firmwareGithubIssueUrl" externalUrl>create a GitHub issue</a>, and attach the update log.</p>
            </div>

-            <div *ngIf="firmwareUpgradeSuccess"
+            <div *ngIf="firmwareUpgradeSuccess$ | async"
                 class="alert alert-success"
                 role="alert">
                <p>Firmware update succeeded.</p>
--- a/packages/uhk-web/src/app/components/device/firmware/device-firmware.component.ts
+++ b/packages/uhk-web/src/app/components/device/firmware/device-firmware.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnDestroy, ViewChild } from '@angular/core';
+import { Component, OnDestroy } from '@angular/core';
 import { Store } from '@ngrx/store';
 import { Observable, Subscription } from 'rxjs';
 import { Constants, HardwareModules, VersionInformation } from 'uhk-common';
@@ -17,7 +17,6 @@ import {
 import { UpdateFirmwareAction, UpdateFirmwareWithAction } from '../../../store/actions/device';
 import { XtermLog } from '../../../models/xterm-log';
 import { UploadFileData } from '../../../models/upload-file-data';
-import { XtermComponent } from '../../xterm/xterm.component';

@Component({
    selector: 'device-firmware',
@@ -31,41 +30,30 @@ export class DeviceFirmwareComponent implements OnDestroy {
    flashFirmwareButtonDisbabled$: Observable<boolean>;
    xtermLog$: Observable<Array<XtermLog>>;
    getAgentVersionInfo$: Observable<VersionInformation>;
+    hardwareModulesSubscription: Subscription;
    hardwareModules: HardwareModules;
    runningOnNotSupportedWindows$: Observable<boolean>;
    firmwareUpgradeAllowed$: Observable<boolean>;
-
+    firmwareUpgradeFailed$: Observable<boolean>;
+    firmwareUpgradeSuccess$: Observable<boolean>;
    firmwareGithubIssueUrl: string;
-    firmwareUpgradeFailed: boolean;
-    firmwareUpgradeSuccess: boolean;
-
-    @ViewChild(XtermComponent, { static: false })
-    xtermRef: XtermComponent;
-
-    private subscription = new Subscription();

    constructor(private store: Store<AppState>) {
        this.flashFirmwareButtonDisbabled$ = store.select(flashFirmwareButtonDisbabled);
        this.xtermLog$ = store.select(xtermLog);
        this.getAgentVersionInfo$ = store.select(getAgentVersionInfo);
-        this.subscription.add(store.select(getHardwareModules).subscribe(data => {
+        this.hardwareModulesSubscription = store.select(getHardwareModules).subscribe(data => {
            this.hardwareModules = data;
-        }));
+        });
        this.runningOnNotSupportedWindows$ = store.select(runningOnNotSupportedWindows);
        this.firmwareUpgradeAllowed$ = store.select(firmwareUpgradeAllowed);
-        this.subscription.add(store.select(firmwareUpgradeFailed).subscribe(data => {
-            this.firmwareUpgradeFailed = data;
-            this.scrollToTheEndOfTheLogs();
-        }));
-        this.subscription.add(store.select(firmwareUpgradeSuccess).subscribe(data => {
-            this.firmwareUpgradeSuccess = data;
-            this.scrollToTheEndOfTheLogs();
-        }));
+        this.firmwareUpgradeFailed$ = store.select(firmwareUpgradeFailed);
+        this.firmwareUpgradeSuccess$ = store.select(firmwareUpgradeSuccess);
        this.firmwareGithubIssueUrl = Constants.FIRMWARE_GITHUB_ISSUE_URL;
    }

    ngOnDestroy(): void {
-        this.subscription.unsubscribe();
+        this.hardwareModulesSubscription.unsubscribe();
    }

    onUpdateFirmware(): void {
@@ -75,10 +63,4 @@ export class DeviceFirmwareComponent implements OnDestroy {
    changeFile(data: UploadFileData): void {
        this.store.dispatch(new UpdateFirmwareWithAction(data.data));
    }
-
-    private scrollToTheEndOfTheLogs(): void {
-        if (this.xtermRef) {
-            this.xtermRef.scrollToTheEnd();
-        }
-    }
 }
--- a/packages/uhk-web/src/app/components/device/mouse-speed/mouse-speed.component.html
+++ b/packages/uhk-web/src/app/components/device/mouse-speed/mouse-speed.component.html
@@ -4,7 +4,7 @@
 </h1>
 <button class="btn btn-danger mouse-speed-reset-button"
        mwlConfirmationPopover
-        popoverTitle="Are you sure?"
+        title="Are you sure?"
        placement="bottom"
        confirmText="Yes"
        cancelText="No"
@@ -12,7 +12,7 @@
 </button>
 <button class="btn btn-danger mouse-speed-reset-button"
        mwlConfirmationPopover
-        popoverTitle="Are you sure?"
+        title="Are you sure?"
        placement="bottom"
        confirmText="Yes"
        cancelText="No"
--- a/packages/uhk-web/src/app/components/editable-text/editable-text.component.html
+++ b/packages/uhk-web/src/app/components/editable-text/editable-text.component.html
@@ -15,7 +15,6 @@
    <textarea class="text-editor"
              [(ngModel)]="text"
              autofocus
-              (keydown.escape)="cancelEditText()"
              (keydown.control.enter)="keydownEnter()"
              (keydown.alt.enter)="keydownEnter()"></textarea>
    <div class="pull-right buttons">
--- a/packages/uhk-web/src/app/components/keymap/header/keymap-header.component.ts
+++ b/packages/uhk-web/src/app/components/keymap/header/keymap-header.component.ts
@@ -39,8 +39,8 @@ export class KeymapHeaderComponent implements OnChanges {
    @Input() deletable: boolean;
    @Output() downloadClick = new EventEmitter<void>();

-    @ViewChild('name', { static: true }) keymapName: ElementRef;
-    @ViewChild('abbr', { static: true }) keymapAbbr: ElementRef;
+    @ViewChild('name') keymapName: ElementRef;
+    @ViewChild('abbr') keymapAbbr: ElementRef;

    starTitle: string;
    trashTitle: string = DEFAULT_TRASH_TITLE;
--- a/packages/uhk-web/src/app/components/macro/action-editor/macro-action-editor.component.ts
+++ b/packages/uhk-web/src/app/components/macro/action-editor/macro-action-editor.component.ts
@@ -31,8 +31,7 @@ export class MacroActionEditorComponent implements OnInit {
    @Output() save = new EventEmitter<MacroAction>();
    @Output() cancel = new EventEmitter<void>();

-    // tslint:disable-next-line:max-line-length
-    @ViewChild('tab', { static: false }) selectedTab: MacroTextTabComponent | MacroKeyTabComponent | MacroMouseTabComponent | MacroDelayTabComponent;
+    @ViewChild('tab') selectedTab: MacroTextTabComponent | MacroKeyTabComponent | MacroMouseTabComponent | MacroDelayTabComponent;

    editableMacroAction: MacroAction;
    activeTab: TabName;
--- a/packages/uhk-web/src/app/components/macro/action-editor/tab/delay/macro-delay.component.ts
+++ b/packages/uhk-web/src/app/components/macro/action-editor/tab/delay/macro-delay.component.ts
@@ -1,8 +1,10 @@
 import {
    ChangeDetectionStrategy,
    Component,
+    ElementRef,
    Input,
-    OnInit
+    OnInit,
+    ViewChild
 } from '@angular/core';
 import { DelayMacroAction } from 'uhk-common';

@@ -19,6 +21,7 @@ const INITIAL_DELAY = 0.5; // In seconds
 })
 export class MacroDelayTabComponent extends MacroBaseComponent implements OnInit {
    @Input() macroAction: DelayMacroAction;
+    @ViewChild('macroDelayInput') input: ElementRef;

    presets: number[] = [0.1, 0.5, 1, 5, 10];

--- a/packages/uhk-web/src/app/components/macro/action-editor/tab/key/macro-key.component.ts
+++ b/packages/uhk-web/src/app/components/macro/action-editor/tab/key/macro-key.component.ts
@@ -21,7 +21,8 @@ enum TabName {
 })
 export class MacroKeyTabComponent extends MacroBaseComponent implements OnInit {
    @Input() macroAction: KeyMacroAction;
-    @ViewChild('keypressTab', { static: true }) keypressTab: KeypressTabComponent;
+    @ViewChild('tab') selectedTab: Tab;
+    @ViewChild('keypressTab') keypressTab: KeypressTabComponent;

    /* tslint:disable:variable-name: It is an enum type. So it can start with uppercase. */
    TabName = TabName;
--- a/packages/uhk-web/src/app/components/macro/action-editor/tab/mouse/macro-mouse.component.ts
+++ b/packages/uhk-web/src/app/components/macro/action-editor/tab/mouse/macro-mouse.component.ts
@@ -1,4 +1,4 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input, OnInit, ViewChild } from '@angular/core';

 import {
    MacroMouseSubAction,
@@ -7,6 +7,7 @@ import {
    MoveMouseMacroAction,
    ScrollMouseMacroAction
 } from 'uhk-common';
+import { Tab } from '../../../../popover/tab';
 import { MacroBaseComponent } from '../macro-base.component';

 type MouseMacroAction = MouseButtonMacroAction | MoveMouseMacroAction | ScrollMouseMacroAction;
@@ -30,6 +31,7 @@ enum TabName {
 })
 export class MacroMouseTabComponent extends MacroBaseComponent implements OnInit {
    @Input() macroAction: MouseMacroAction;
+    @ViewChild('tab') selectedTab: Tab;

    /* tslint:disable:variable-name: It is an enum type. So it can start with uppercase. */
    MouseButtons = MouseButtons;
--- a/packages/uhk-web/src/app/components/macro/action-editor/tab/text/macro-text.component.ts
+++ b/packages/uhk-web/src/app/components/macro/action-editor/tab/text/macro-text.component.ts
@@ -20,7 +20,7 @@ const NON_ASCII_REGEXP = /[^\x00-\x7F]/g;
 })
 export class MacroTextTabComponent extends MacroBaseComponent implements OnInit, AfterViewInit {
    @Input() macroAction: TextMacroAction;
-    @ViewChild('macroTextInput', { static: false } ) input: ElementRef;
+    @ViewChild('macroTextInput') input: ElementRef;

    constructor() { super(); }

--- a/packages/uhk-web/src/app/components/macro/header/macro-header.component.ts
+++ b/packages/uhk-web/src/app/components/macro/header/macro-header.component.ts
@@ -26,7 +26,7 @@ import * as util from '../../../util';
 export class MacroHeaderComponent implements AfterViewInit, OnChanges {
    @Input() macro: Macro;
    @Input() isNew: boolean;
-    @ViewChild('macroName', { static: true }) macroName: ElementRef;
+    @ViewChild('macroName') macroName: ElementRef;

    constructor(private store: Store<AppState>, private renderer: Renderer2) { }

--- a/packages/uhk-web/src/app/components/macro/list/macro-list.component.ts
+++ b/packages/uhk-web/src/app/components/macro/list/macro-list.component.ts
@@ -46,6 +46,7 @@ export class MacroListComponent {
    newMacro: Macro = undefined;
    showNew: boolean = false;
    private activeEdit: number = undefined;
+    private dragIndex: number;

    constructor(
        private mapper: MapperService,
@@ -58,18 +59,16 @@ export class MacroListComponent {
            }
        });

-        dragulaService.drop('macroActions').subscribe(value => {
-            if (value.el) {
-                let newIndex = this.macroItems.length - 1;
-
-                if (value.sibling) {
-                    newIndex = (+value.sibling.getAttribute('data-index') - 1);
-                }
+        dragulaService.drag('macroActions').subscribe((value: any) => {
+            this.dragIndex = +value[1].getAttribute('data-index');
+        });

+        dragulaService.drop('macroActions').subscribe((value: any) => {
+            if (value[4]) {
                this.reorder.emit({
                    macroId: this.macro.id,
-                    oldIndex: +value.el.getAttribute('data-index'),
-                    newIndex
+                    oldIndex: this.dragIndex,
+                    newIndex: +value[4].getAttribute('data-index')
                });
            }
        });
--- a/packages/uhk-web/src/app/components/popover/popover.component.html
+++ b/packages/uhk-web/src/app/components/popover/popover.component.html
@@ -38,7 +38,6 @@
        ></layer-tab>
        <mouse-tab #tab *ngSwitchCase="tabName.Mouse" class="popover-content"
                   [defaultKeyAction]="defaultKeyAction"
-                   [extraMouseButtonsSupported]="extraMouseButtonsSupported$ | async"
                   (validAction)="setKeyActionValidState($event)"
        ></mouse-tab>
        <macro-tab #tab *ngSwitchCase="tabName.Macro" class="popover-content"
--- a/packages/uhk-web/src/app/components/popover/popover.component.ts
+++ b/packages/uhk-web/src/app/components/popover/popover.component.ts
@@ -30,7 +30,7 @@ import {

 import { Tab } from './tab';

-import { AppState, extraMouseButtonsSupported, getKeymaps, macroPlaybackSupported } from '../../store';
+import { AppState, getKeymaps, macroPlaybackSupported } from '../../store';
 import { KeyActionRemap } from '../../models/key-action-remap';
 import { RemapInfo } from '../../models/remap-info';

@@ -98,8 +98,8 @@ export class PopoverComponent implements OnChanges {
    @Output() cancel = new EventEmitter<any>();
    @Output() remap = new EventEmitter<KeyActionRemap>();

-    @ViewChild('tab', { static: false }) selectedTab: Tab;
-    @ViewChild('popover', { static: false }) popoverHost: ElementRef;
+    @ViewChild('tab') selectedTab: Tab;
+    @ViewChild('popover') popoverHost: ElementRef;

    tabName = TabName;
    keyActionValid: boolean;
@@ -145,7 +145,6 @@ export class PopoverComponent implements OnChanges {
        }
    ];
    macroPlaybackSupported$: Observable<boolean>;
-    extraMouseButtonsSupported$: Observable<boolean>;

    private readonly currentKeymap$ = new BehaviorSubject<Keymap>(undefined);

@@ -159,7 +158,6 @@ export class PopoverComponent implements OnChanges {
                        keymaps.filter((keymap: Keymap) => currentKeymap.abbreviation !== keymap.abbreviation))
            );
        this.macroPlaybackSupported$ = store.select(macroPlaybackSupported);
-        this.extraMouseButtonsSupported$ = store.select(extraMouseButtonsSupported);
    }

    ngOnChanges(change: SimpleChanges) {
--- a/packages/uhk-web/src/app/components/popover/tab/mouse/mouse-tab.component.html
+++ b/packages/uhk-web/src/app/components/popover/tab/mouse/mouse-tab.component.html
@@ -80,27 +80,6 @@
                    [class.btn-primary]="mouseActionParam === MouseActionParam.rightClick"
                    (click)="setMouseActionParam(MouseActionParam.rightClick)">Right</button>
        </div>
-        <div class="additional-keys" *ngIf="extraMouseButtonsSupported">
-            <div class="btn-group col-xs-12" role="group">
-                <button type="button" class="btn btn-default col-xs-4"
-                        [class.btn-primary]="mouseActionParam === MouseActionParam.button4"
-                        (click)="setMouseActionParam(MouseActionParam.button4)">Button 4</button>
-                <button type="button" class="btn btn-default col-xs-4"
-                        [class.btn-primary]="mouseActionParam === MouseActionParam.button5"
-                        (click)="setMouseActionParam(MouseActionParam.button5)">Button 5</button>
-                <button type="button" class="btn btn-default col-xs-4"
-                        [class.btn-primary]="mouseActionParam === MouseActionParam.button6"
-                        (click)="setMouseActionParam(MouseActionParam.button6)">Button 6</button>
-            </div>
-            <div class="btn-group col-xs-12" role="group">
-                <button type="button" class="btn btn-default col-xs-6"
-                        [class.btn-primary]="mouseActionParam === MouseActionParam.button7"
-                        (click)="setMouseActionParam(MouseActionParam.button7)">Button 7</button>
-                <button type="button" class="btn btn-default col-xs-6"
-                        [class.btn-primary]="mouseActionParam === MouseActionParam.button8"
-                        (click)="setMouseActionParam(MouseActionParam.button8)">Button 8</button>
-            </div>
-        </div>
    </div>
    <div *ngSwitchCase="3" class="mouse__config mouse__config--speed text-center">
        <div class="help-text--mouse-speed text-left">
--- a/packages/uhk-web/src/app/components/popover/tab/mouse/mouse-tab.component.scss
+++ b/packages/uhk-web/src/app/components/popover/tab/mouse/mouse-tab.component.scss
@@ -54,32 +54,6 @@
    }
 }

-.mouse__config--click {
-    .additional-keys {
-        display: inline-block;
-        margin-top: 1rem;
-
-        .btn-group:first-child {
-            .btn {
-                border-bottom-left-radius: 0;
-                border-bottom-right-radius: 0;
-            }
-        }
-
-        .btn-group:last-child {
-            .btn {
-                border-top: 0;
-                border-top-left-radius: 0;
-                border-top-right-radius: 0;
-
-                &:last-child {
-                    right: 1px;
-                }
-            }
-        }
-    }
-}
-
 .mouse__config--speed {
    .btn-default {
        font-size: 25px;
--- a/packages/uhk-web/src/app/components/popover/tab/mouse/mouse-tab.component.ts
+++ b/packages/uhk-web/src/app/components/popover/tab/mouse/mouse-tab.component.ts
@@ -11,7 +11,6 @@ import { Tab } from '../tab';
 })
 export class MouseTabComponent extends Tab implements OnChanges {
    @Input() defaultKeyAction: KeyAction;
-    @Input() extraMouseButtonsSupported: boolean;

    /* tslint:disable:variable-name: It is an enum type. So it can start with uppercase. */
    MouseActionParam = MouseActionParam;
@@ -63,11 +62,6 @@ export class MouseTabComponent extends Tab implements OnChanges {
            case MouseActionParam.leftClick:
            case MouseActionParam.middleClick:
            case MouseActionParam.rightClick:
-            case MouseActionParam.button4:
-            case MouseActionParam.button5:
-            case MouseActionParam.button6:
-            case MouseActionParam.button7:
-            case MouseActionParam.button8:
                this.selectedPageIndex = 2;
                break;
            case MouseActionParam.decelerate:
--- a/packages/uhk-web/src/app/components/side-menu/side-menu.component.ts
+++ b/packages/uhk-web/src/app/components/side-menu/side-menu.component.ts
@@ -2,9 +2,10 @@ import {
    ChangeDetectionStrategy,
    ChangeDetectorRef,
    Component,
-    OnDestroy,
-    OnInit,
-    Renderer2
+    ElementRef,
+    OnDestroy, OnInit,
+    Renderer2,
+    ViewChild
 } from '@angular/core';
 import { animate, state, style, transition, trigger } from '@angular/animations';

@@ -37,6 +38,7 @@ import { SideMenuPageState } from '../../models/side-menu-page-state';
 export class SideMenuComponent implements OnInit, OnDestroy {
    state: SideMenuPageState;
    animation: { [key: string]: 'active' | 'inactive' };
+    @ViewChild('deviceName') deviceName: ElementRef;

    private stateSubscription: Subscription;

--- a/packages/uhk-web/src/app/components/slider-wrapper/slider-wrapper.component.ts
+++ b/packages/uhk-web/src/app/components/slider-wrapper/slider-wrapper.component.ts
@@ -28,7 +28,7 @@ export interface SliderProps {
    ]
 })
 export class SliderWrapperComponent implements AfterViewInit, ControlValueAccessor, OnDestroy {
-    @ViewChild(NouisliderComponent, { static: false }) slider: NouisliderComponent;
+    @ViewChild(NouisliderComponent) slider: NouisliderComponent;
    @Input() label: string;
    @Input() tooltip: string;
    @Input() min: number;
--- a/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.ts
+++ b/packages/uhk-web/src/app/components/svg/keyboard/svg-keyboard.component.ts
@@ -91,7 +91,6 @@ export class SvgKeyboardComponent {
        this.modules = [];
        this.viewBox = '-520 582 1100 470';
        this.moduleAnimationStates = [];
-        this.moduleVisibilityAnimationStates = [];
    }

    ngOnInit() {
--- a/packages/uhk-web/src/app/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.scss
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.scss
@@ -1,4 +1,8 @@
 :host {
+    /deep/ text {
+        dominant-baseline: central;
+    }
+
    cursor: pointer;
    outline: none;

--- a/packages/uhk-web/src/app/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-keyboard-key/svg-keyboard-key.component.ts
@@ -79,7 +79,7 @@ export class SvgKeyboardKeyComponent implements OnChanges {
    @Output() keyClick = new EventEmitter<SvgKeyClickEvent>();
    @Output() capture = new EventEmitter<SvgKeyCaptureEvent>();

-    @ViewChild('svgRec', { static: false }) svgRec: ElementRef<HTMLElement>;
+    @ViewChild('svgRec') svgRec: ElementRef<HTMLElement>;

    enumLabelTypes = LabelTypes;

--- a/packages/uhk-web/src/app/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.html
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-keystroke-key/svg-keystroke-key.component.html
@@ -25,17 +25,17 @@
    </svg>
    <svg viewBox="0 0 100 100" [attr.width]="control.width" [attr.height]="control.height" [attr.x]="control.x" [attr.y]="control.y"
        preserveAspectRatio="none" [class.disabled]="control.disabled">
-        <svg:text text-anchor="middle" alignment-baseline="middle" x="50" y="55">C</svg:text>
+        <svg:text [attr.text-anchor]="'middle'" [attr.x]="50" [attr.y]="50">C</svg:text>
    </svg>
    <svg viewBox="0 0 100 100" [attr.width]="option.width" [attr.height]="option.height" [attr.x]="option.x" [attr.y]="option.y"
        preserveAspectRatio="none" [class.disabled]="option.disabled">
        <svg:use *ngIf="modifierIconNames.option" [attr.xlink:href]="modifierIconNames.option" />
-        <svg:text *ngIf="!modifierIconNames.option" text-anchor="middle" alignment-baseline="middle" x="50" y="55">A</svg:text>
+        <svg:text *ngIf="!modifierIconNames.option" [attr.text-anchor]="'middle'" [attr.x]="50" [attr.y]="50">A</svg:text>
    </svg>
    <svg viewBox="0 0 100 100" [attr.width]="command.width" [attr.height]="command.height" [attr.x]="command.x" [attr.y]="command.y"
        preserveAspectRatio="none" [class.disabled]="command.disabled">
        <svg:use *ngIf="modifierIconNames.command" [attr.xlink:href]="modifierIconNames.command" />
-        <svg:text *ngIf="!modifierIconNames.command" text-anchor="middle" alignment-baseline="middle" x="50" y="55">S</svg:text>
+        <svg:text *ngIf="!modifierIconNames.command" [attr.text-anchor]="'middle'" [attr.x]="50" [attr.y]="50">S</svg:text>
    </svg>
 </svg>
 <svg:g svg-secondary-role
--- a/packages/uhk-web/src/app/components/svg/keys/svg-mouse-click-key/svg-mouse-click-key.html
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-mouse-click-key/svg-mouse-click-key.html
@@ -5,12 +5,12 @@
    [attr.y]="0"
    [attr.text-anchor]="'middle'"
    [attr.font-size]="25">
-        <tspan dy="45"> Click </tspan>
+        <tspan dy="34"> Click </tspan>
 </svg:text>
 <svg:text
    [attr.x]="50"
    [attr.y]="0"
    [attr.text-anchor]="'middle'"
    [attr.font-size]="25">
-        <tspan dy="80"> {{ button }} </tspan>
+        <tspan dy="70"> {{ button }} </tspan>
 </svg:text>
--- a/packages/uhk-web/src/app/components/svg/keys/svg-mouse-key/svg-mouse-key.ts
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-mouse-key/svg-mouse-key.ts
@@ -28,26 +28,6 @@ export class SvgMouseKeyComponent implements OnChanges {
                this.type = 'click';
                this.param = 'Middle';
                break;
-            case MouseActionParam.button4:
-                this.type = 'click';
-                this.param = 'Button 4';
-                break;
-            case MouseActionParam.button5:
-                this.type = 'click';
-                this.param = 'Button 5';
-                break;
-            case MouseActionParam.button6:
-                this.type = 'click';
-                this.param = 'Button 6';
-                break;
-            case MouseActionParam.button7:
-                this.type = 'click';
-                this.param = 'Button 7';
-                break;
-            case MouseActionParam.button8:
-                this.type = 'click';
-                this.param = 'Button 8';
-                break;
            case MouseActionParam.scrollDown:
                this.type = 'scroll';
                this.param = 'down';
--- a/packages/uhk-web/src/app/components/svg/keys/svg-mouse-move-key/svg-mouse-move-key.html
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-mouse-move-key/svg-mouse-move-key.html
@@ -4,6 +4,6 @@
    [attr.y]="0"
    [attr.text-anchor]="'middle'"
    [attr.font-size]="24">
-        <tspan dy="45"> Move </tspan>
+        <tspan dy="34"> Move </tspan>
 </svg:text>
 <svg:use [attr.xlink:href]="directionIcon" width="30" height="30" x="35" y="55"></svg:use>
--- a/packages/uhk-web/src/app/components/svg/keys/svg-mouse-scroll-key/svg-mouse-scroll-key.html
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-mouse-scroll-key/svg-mouse-scroll-key.html
@@ -4,6 +4,6 @@
    [attr.y]="0"
    [attr.text-anchor]="'middle'"
    [attr.font-size]="24">
-        <tspan dy="45"> Scroll </tspan>
+        <tspan dy="34"> Scroll </tspan>
 </svg:text>
 <svg:use [attr.xlink:href]="directionIcon" width="30" height="30" x="35" y="55"></svg:use>
--- a/packages/uhk-web/src/app/components/svg/keys/svg-mouse-speed-key/svg-mouse-speed-key.html
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-mouse-speed-key/svg-mouse-speed-key.html
@@ -5,12 +5,12 @@
    [attr.y]="0"
    [attr.text-anchor]="'middle'"
    [attr.font-size]="25">
-        <tspan dy="45"> Speed </tspan>
+        <tspan dy="34"> Speed </tspan>
 </svg:text>
 <svg:text
    [attr.x]="50"
    [attr.y]="0"
    [attr.text-anchor]="'middle'"
    [attr.font-size]="30">
-        <tspan dy="80"> {{ sign }} </tspan>
+        <tspan dy="70"> {{ sign }} </tspan>
 </svg:text>
--- a/packages/uhk-web/src/app/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.html
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.html
@@ -1,9 +1,8 @@
 <svg:text
-    [attr.x]="textX"
+    [attr.x]="0"
    [attr.y]="textY"
-    text-anchor="middle"
-    alignment-baseline="middle">
-    {{ text }}
+    [attr.text-anchor]="'middle'">
+    <tspan [attr.x]="spanX" dy="0">{{ text }}</tspan>
 </svg:text>
 <svg:g svg-secondary-role
       *ngIf="secondaryText"
--- a/packages/uhk-web/src/app/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.ts
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-one-line-text-key/svg-one-line-text-key.component.ts
@@ -14,8 +14,8 @@ export class SvgOneLineTextKeyComponent implements OnChanges {
    @Input() text: string;
    @Input() secondaryText: string;

-    textX: number;
    textY: number;
+    spanX: number;
    secondaryTextY: number;
    secondaryHeight: number;

@@ -34,8 +34,8 @@ export class SvgOneLineTextKeyComponent implements OnChanges {
            secondaryYModifier = 5;
        }

-        this.textX = this.width / 2;
        this.textY = this.height / 2 - textYModifier;
+        this.spanX = this.width / 2;

        this.secondaryHeight = this.height / 4;
        this.secondaryTextY = this.height - this.secondaryHeight - SECONDARY_ROLE_BOTTOM_MARGIN - secondaryYModifier;
--- a/packages/uhk-web/src/app/components/svg/keys/svg-secondary-role/svg-secondary-role.component.html
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-secondary-role/svg-secondary-role.component.html
@@ -1,15 +1,14 @@
 <svg [attr.viewBox]="viewBox" [attr.width]="width" [attr.height]="height" [attr.y]="y">
-    <g [attr.transform]="transform">
+    <g id="secondaryContent" [attr.transform]="transform">
        <svg viewBox="0 0 14 14" width="12" height="12" x="2" [attr.y]="textY / 3.5">
            <ellipse stroke="#fff" rx="6.5" ry="6.5" cy="7" cx="7" stroke-width="1" fill-opacity="0"/>
-            <text text-anchor="start" alignment-baseline="middle" font-family="Helvetica" font-size="12" y="7.8" x="4" stroke-width="0">2
+            <text text-anchor="start" font-family="Helvetica" font-size="12" y="7.8" x="4" stroke-width="0">2
            </text>
        </svg>
        <text [attr.y]="textY"
              [attr.x]="textIndent"
              font-size="12"
-              text-anchor="start"
-              alignment-baseline="middle">
+              text-anchor="start">
            {{ text }}
        </text>
    </g>
--- a/packages/uhk-web/src/app/components/svg/keys/svg-secondary-role/svg-secondary-role.component.scss
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-secondary-role/svg-secondary-role.component.scss
@@ -1,3 +0,0 @@
-text {
-    dominant-baseline: text-bottom;
-}
--- a/packages/uhk-web/src/app/components/svg/keys/svg-secondary-role/svg-secondary-role.component.ts
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-secondary-role/svg-secondary-role.component.ts
@@ -1,10 +1,12 @@
 import {
    ChangeDetectionStrategy,
    Component,
+    ElementRef,
    Input,
    OnChanges,
    OnInit,
-    SimpleChanges
+    SimpleChanges,
+    ViewChild
 } from '@angular/core';

 import { getContentWidth } from '../../../../util';
@@ -16,7 +18,6 @@ const SECONDARY_STYLE: CSSStyleDeclaration = {
@Component({
    selector: 'g[svg-secondary-role]',
    templateUrl: './svg-secondary-role.component.html',
-    styleUrls: ['./svg-secondary-role.component.scss'],
    changeDetection: ChangeDetectionStrategy.OnPush
 })
 export class SvgSecondaryRoleComponent implements OnInit, OnChanges {
@@ -25,6 +26,8 @@ export class SvgSecondaryRoleComponent implements OnInit, OnChanges {
    @Input() y: number;
    @Input() text: string;

+    @ViewChild('secondary') svgElement: ElementRef;
+
    viewBox: string;
    textY: number;
    transform: string;
--- a/packages/uhk-web/src/app/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.html
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.html
@@ -5,9 +5,8 @@
        [attr.y]="useY">
 </svg:use>
 <svg:text
-    [attr.x]="textX"
+    [attr.x]="0"
    [attr.y]="textY"
-    text-anchor="middle"
-    alignment-baseline="middle">
-    {{ abbreviation }}
+    [attr.text-anchor]="'middle'">
+        <tspan [attr.x]="spanX">{{ abbreviation }}</tspan>
 </svg:text>
--- a/packages/uhk-web/src/app/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-switch-keymap-key/svg-switch-keymap-key.component.ts
@@ -18,7 +18,7 @@ export class SvgSwitchKeymapKeyComponent implements OnInit {
    useX: number;
    useY: number;
    textY: number;
-    textX: number;
+    spanX: number;

    constructor(private mapperService: MapperService) { }

@@ -30,6 +30,6 @@ export class SvgSwitchKeymapKeyComponent implements OnInit {
        this.useX = this.width * 3 / 8;
        this.useY = this.height / 5;
        this.textY = this.height * 2 / 3;
-        this.textX = this.width / 2;
+        this.spanX = this.width / 2;
    }
 }
--- a/packages/uhk-web/src/app/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.html
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.html
@@ -1,10 +1,9 @@
-<svg:text
-    [attr.x]="textX"
+ <svg:text
+    [attr.x]="0"
    [attr.y]="textY"
-    [attr.text-anchor]="textAnchor"
-    alignment-baseline="middle">
-    {{ text }}
-</svg:text>
+    [attr.text-anchor]="textAnchor">
+        <tspan [attr.x]="spanX">{{ text }}</tspan>
+ </svg:text>
 <svg:use [attr.xlink:href]="icon"
        [attr.width]="useWidth"
        [attr.height]="useHeight"
--- a/packages/uhk-web/src/app/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.ts
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-text-icon-key/svg-text-icon-key.component.ts
@@ -21,7 +21,7 @@ export class SvgTextIconKeyComponent implements OnChanges {
    useY: number;
    textY: number;
    textAnchor: string;
-    textX: number;
+    spanX: number;
    secondaryTextY: number;
    secondaryHeight: number;

@@ -46,7 +46,7 @@ export class SvgTextIconKeyComponent implements OnChanges {
        this.useY = (this.width > 2 * this.height) ? this.height / 3 : this.height / 2;
        this.textY = ((this.width > 2 * this.height) ? this.height / 2 : this.height / 3) - textYModifier;
        this.textAnchor = (this.width > 2 * this.height) ? 'end' : 'middle';
-        this.textX = (this.width > 2 * this.height) ? 0.6 * this.width : this.width / 2;
+        this.spanX = (this.width > 2 * this.height) ? 0.6 * this.width : this.width / 2;

        this.secondaryHeight = this.height / 4;
        this.secondaryTextY = this.height - this.secondaryHeight - SECONDARY_ROLE_BOTTOM_MARGIN - secondaryYModifier;
--- a/packages/uhk-web/src/app/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.html
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.html
@@ -1,12 +1,12 @@
 <svg:text
    [attr.x]="0"
    [attr.y]="textY"
-    text-anchor="middle"
-    alignment-baseline="middle">
+    [attr.text-anchor]="'middle'">
         <tspan
                *ngFor="let text of texts; let index = index"
                [attr.x]="spanX"
                [attr.y]="spanYs[index]"
+                dy="0"
                >{{ text }}</tspan>
 </svg:text>
 <svg:g svg-secondary-role
--- a/packages/uhk-web/src/app/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.ts
+++ b/packages/uhk-web/src/app/components/svg/keys/svg-two-line-text-key/svg-two-line-text-key.component.ts
@@ -27,11 +27,13 @@ export class SvgTwoLineTextKeyComponent implements OnChanges {
    }

    calculatePositions(): void {
+        let textYModifier = 0;
        let secondaryYModifier = 0;
        this.secondaryHeight = 0;
        let textContainerHeight = this.height;

        if (this.secondaryText) {
+            textYModifier =  this.height / 5;
            secondaryYModifier = 0;
            this.secondaryHeight = this.height / 4;
            textContainerHeight -= this.secondaryHeight;
@@ -41,7 +43,7 @@ export class SvgTwoLineTextKeyComponent implements OnChanges {
        this.spanX = this.width / 2;
        this.spanYs = [];
        for (let i = 0; i < this.texts.length; ++i) {
-            this.spanYs.push((0.85 - i * 0.5) * textContainerHeight);
+            this.spanYs.push((0.75 - i * 0.5) * textContainerHeight);
        }

        this.secondaryTextY = this.height - this.secondaryHeight - SECONDARY_ROLE_BOTTOM_MARGIN - secondaryYModifier;
--- a/packages/uhk-web/src/app/components/svg/wrap/svg-keyboard-wrap.component.ts
+++ b/packages/uhk-web/src/app/components/svg/wrap/svg-keyboard-wrap.component.ts
@@ -73,7 +73,7 @@ export class SvgKeyboardWrapComponent implements OnInit, OnChanges {

    @Output() descriptionChanged = new EventEmitter<ChangeKeymapDescription>();

-    @ViewChild(PopoverComponent, { read: ElementRef, static: false }) popover: ElementRef;
+    @ViewChild(PopoverComponent, { read: ElementRef }) popover: ElementRef;

    popoverShown: boolean;
    keyEditConfig: { moduleId: number, keyId: number };
@@ -218,7 +218,7 @@ export class SvgKeyboardWrapComponent implements OnInit, OnChanges {
            return;
        }

-        const el = event.target as Element;
+        const el: Element = event.target as Element || event.srcElement;
        const position: ClientRect = el.getBoundingClientRect();
        let posLeft: number = this.tooltipData.posLeft;
        let posTop: number = this.tooltipData.posTop;
--- a/packages/uhk-web/src/app/components/xterm/xterm.component.ts
+++ b/packages/uhk-web/src/app/components/xterm/xterm.component.ts
@@ -10,11 +10,13 @@ import { XtermLog } from '../../models/xterm-log';
 export class XtermComponent implements OnChanges {
    @Input() logs: Array<XtermLog> = [];

-    @ViewChild('scrollMe', { static: false }) divElement: ElementRef;
+    @ViewChild('scrollMe') divElement: ElementRef;

    ngOnChanges(changes: SimpleChanges): void {
-        if (changes.logs) {
-            this.scrollToTheEnd();
+        if (changes.logs && this.divElement && this.divElement.nativeElement) {
+            setTimeout(() => {
+                this.divElement.nativeElement.scrollTop = this.divElement.nativeElement.scrollHeight;
+            });
        }
    }

@@ -22,11 +24,4 @@ export class XtermComponent implements OnChanges {
        return this.logs.reduce((value, line) => value + line.message + '\n', '');
    }

-    scrollToTheEnd(): void {
-        setTimeout(() => {
-            if (this.divElement && this.divElement.nativeElement) {
-                this.divElement.nativeElement.scrollTop = this.divElement.nativeElement.scrollHeight;
-            }
-        });
-    }
 }
--- a/packages/uhk-web/src/app/store/index.ts
+++ b/packages/uhk-web/src/app/store/index.ts
@@ -157,6 +157,3 @@ export const layerDoubleTapSupported = createSelector(
        return isVersionGte(hardwareModules.rightModuleInfo.firmwareVersion, '8.4.3');
    }
 );
-export const extraMouseButtonsSupported = createSelector(getHardwareModules, (hardwareModules: HardwareModules): boolean => {
-    return isVersionGte(hardwareModules.rightModuleInfo.userConfigVersion, '4.1.1');
-});
--- a/packages/uhk-web/src/app/store/reducers/device.ts
+++ b/packages/uhk-web/src/app/store/reducers/device.ts
@@ -49,7 +49,7 @@ export const initialState: State = {
    log: [{ message: '', cssClass: XtermCssClass.standard }],
    restoringUserConfiguration: false,
    hasBackupUserConfiguration: false,
-    halvesInfo: { isLeftHalfConnected: true, areHalvesMerged: false }
+    halvesInfo: { isLeftHalfConnected: true, areHalvesMerged: true }
 };

 export function reducer(state = initialState, action: Action): State {
--- a/packages/uhk-web/src/app/store/reducers/user-configuration.ts
+++ b/packages/uhk-web/src/app/store/reducers/user-configuration.ts
@@ -446,9 +446,16 @@ export function reducer(
            const userConfiguration: UserConfiguration = Object.assign(new UserConfiguration(), state.userConfiguration);
            userConfiguration.macros = state.userConfiguration.macros.map((macro: Macro) => {
                if (macro.id === payload.id) {
+                    let newIndex: number = payload.newIndex;
+
+                    // We need to reduce the new index for one when we are moving action down
+                    if (newIndex > payload.oldIndex) {
+                        --newIndex;
+                    }
+
                    macro = new Macro(macro);
                    macro.macroActions.splice(
-                        payload.newIndex,
+                        newIndex,
                        0,
                        macro.macroActions.splice(payload.oldIndex, 1)[0]
                    );
--- a/packages/uhk-web/src/app/web.module.ts
+++ b/packages/uhk-web/src/app/web.module.ts
@@ -15,7 +15,7 @@ import { effects } from './store/effects';
        BrowserModule,
        SharedModule,
        StoreModule.forRoot(reducers),
-        StoreRouterConnectingModule.forRoot(),
+        StoreRouterConnectingModule,
        StoreDevtoolsModule.instrument({
            maxAge: 10
        }),
--- a/packages/uhk-web/src/main-renderer.ts
+++ b/packages/uhk-web/src/main-renderer.ts
@@ -8,6 +8,4 @@ if (environment.production) {
  enableProdMode();
 }

-platformBrowserDynamic().bootstrapModule(UhkRendererModule, {
-    preserveWhitespaces: true
-});
+platformBrowserDynamic().bootstrapModule(UhkRendererModule);
--- a/packages/uhk-web/src/main-web.ts
+++ b/packages/uhk-web/src/main-web.ts
@@ -5,9 +5,7 @@ import { WebModule } from './app/web.module';
 import { environment } from './environments/environment';

 if (environment.production) {
-    enableProdMode();
+  enableProdMode();
 }

-platformBrowserDynamic().bootstrapModule(WebModule, {
-    preserveWhitespaces: true
-});
+platformBrowserDynamic().bootstrapModule(WebModule);
--- a/packages/uhk-web/src/renderer/uhk-renderer.module.ts
+++ b/packages/uhk-web/src/renderer/uhk-renderer.module.ts
@@ -22,7 +22,7 @@ import { effects } from '../app/store/effects';
        SharedModule,
        routing,
        StoreModule.forRoot(reducers),
-        StoreRouterConnectingModule.forRoot(),
+        StoreRouterConnectingModule,
        StoreDevtoolsModule.instrument({
            maxAge: 10
        }),
--- a/packages/uhk-web/src/tsconfig.renderer.json
+++ b/packages/uhk-web/src/tsconfig.renderer.json
@@ -3,7 +3,7 @@
  "compilerOptions": {
    "outDir": "./dist/out-tsc",
    "baseUrl": "./",
-    "target": "es5", // Until https://github.com/electron/electron/issues/12011 not working without custom protocol
+    "target": "es6",
    "types": ["node"],
    "lib": [
      "es2016",
--- a/packages/usb/package-lock.json
+++ b/packages/usb/package-lock.json
@@ -37,9 +37,9 @@
 			"integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
 		},
 		"base64-js": {
-			"version": "1.3.1",
-			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
-			"integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g=="
+			"version": "0.0.8",
+			"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+			"integrity": "sha1-EQHpVE9KdrG8OybUUsqW16NeeXg="
 		},
 		"bindings": {
 			"version": "1.5.0",
@@ -68,38 +68,20 @@
 			}
 		},
 		"buffer": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.0.tgz",
-			"integrity": "sha512-Xpgy0IwHK2N01ncykXTy6FpCWuM+CJSHoPVBLyNqyrWxsedpLvwsYUhf0ME3WRFNUhos0dMamz9cOS/xRDtU5g==",
+			"version": "3.6.0",
+			"resolved": "https://registry.npmjs.org/buffer/-/buffer-3.6.0.tgz",
+			"integrity": "sha1-pyyTb3e5a/UvX357RnGAYoVR3vs=",
 			"requires": {
-				"base64-js": "^1.0.2",
-				"ieee754": "^1.1.4"
+				"base64-js": "0.0.8",
+				"ieee754": "^1.1.4",
+				"isarray": "^1.0.0"
 			}
 		},
-		"buffer-alloc": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/buffer-alloc/-/buffer-alloc-1.2.0.tgz",
-			"integrity": "sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow==",
-			"requires": {
-				"buffer-alloc-unsafe": "^1.1.0",
-				"buffer-fill": "^1.0.0"
-			}
-		},
-		"buffer-alloc-unsafe": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz",
-			"integrity": "sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg=="
-		},
 		"buffer-crc32": {
 			"version": "0.2.13",
 			"resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
 			"integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI="
 		},
-		"buffer-fill": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/buffer-fill/-/buffer-fill-1.0.0.tgz",
-			"integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
-		},
 		"chalk": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
@@ -111,9 +93,9 @@
 			}
 		},
 		"chownr": {
-			"version": "1.1.2",
-			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.2.tgz",
-			"integrity": "sha512-GkfeAQh+QNy3wquu9oIZr6SS5x7wGdSgNQvD10X3r+AZr1Oys22HW8kAmDMvNg2+Dm0TeGaEuO8gFwdBXxwO8A=="
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+			"integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g=="
 		},
 		"code-point-at": {
 			"version": "1.1.0",
@@ -121,11 +103,11 @@
 			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c="
 		},
 		"color-convert": {
-			"version": "1.9.3",
-			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-			"integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+			"version": "1.9.1",
+			"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz",
+			"integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==",
 			"requires": {
-				"color-name": "1.1.3"
+				"color-name": "^1.1.1"
 			}
 		},
 		"color-name": {
@@ -134,9 +116,9 @@
 			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU="
 		},
 		"commander": {
-			"version": "2.20.0",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-			"integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+			"version": "2.15.1",
+			"resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+			"integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag=="
 		},
 		"concat-map": {
 			"version": "0.0.1",
@@ -273,9 +255,9 @@
 			"integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
 		},
 		"fd-slicer": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-			"integrity": "sha1-JcfInLH5B3+IkbvmHY85Dq4lbx4=",
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+			"integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
 			"requires": {
 				"pend": "~1.2.0"
 			}
@@ -290,11 +272,6 @@
 			"resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
 			"integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw=="
 		},
-		"fs-constants": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz",
-			"integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="
-		},
 		"fs.realpath": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -330,9 +307,9 @@
 			"integrity": "sha1-l/tdlr/eiXMxPyDoKI75oWf6ZM4="
 		},
 		"glob": {
-			"version": "7.1.4",
-			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz",
-			"integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==",
+			"version": "7.1.2",
+			"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+			"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
 			"requires": {
 				"fs.realpath": "^1.0.0",
 				"inflight": "^1.0.4",
@@ -343,9 +320,9 @@
 			}
 		},
 		"graceful-fs": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.1.tgz",
-			"integrity": "sha512-b9usnbDGnD928gJB3LrCmxoibr3VE4U2SMo5PBuBnokWyDADTqDPXg4YpwKF1trpH+UbGp7QLicO3+aWEy0+mw=="
+			"version": "4.1.11",
+			"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+			"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
 		},
 		"graceful-readlink": {
 			"version": "1.0.1",
@@ -363,9 +340,9 @@
 			"integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk="
 		},
 		"ieee754": {
-			"version": "1.1.13",
-			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
-			"integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="
+			"version": "1.1.11",
+			"resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.11.tgz",
+			"integrity": "sha512-VhDzCKN7K8ufStx/CLj5/PDTMgph+qwN5Pkd5i0sGnVwk56zJ0lkT8Qzi1xqWLS0Wp29DgDtNeS7v8/wMoZeHg=="
 		},
 		"inflight": {
 			"version": "1.0.6",
@@ -377,9 +354,9 @@
 			}
 		},
 		"inherits": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-			"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+			"integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
 		},
 		"ini": {
 			"version": "1.3.5",
@@ -387,9 +364,9 @@
 			"integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw=="
 		},
 		"interpret": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
-			"integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw=="
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz",
+			"integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ="
 		},
 		"is-fullwidth-code-point": {
 			"version": "1.0.0",
@@ -415,9 +392,9 @@
 			"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
 		},
 		"make-dir": {
-			"version": "1.3.0",
-			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz",
-			"integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz",
+			"integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==",
 			"requires": {
 				"pify": "^3.0.0"
 			},
@@ -473,17 +450,17 @@
 			"integrity": "sha512-boQj1WFgQH3v4clhu3mTNfP+vOBxorDlE8EKiMjUlLG3C4qAESnn9AxIOkFgTR2c9LtzNjPrjS60cT27ZKBhaA=="
 		},
 		"node-abi": {
-			"version": "2.11.0",
-			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.11.0.tgz",
-			"integrity": "sha512-kuy/aEg75u40v378WRllQ4ZexaXJiCvB68D2scDXclp/I4cRq6togpbOoKhmN07tns9Zldu51NNERo0wehfX9g==",
+			"version": "2.8.0",
+			"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.8.0.tgz",
+			"integrity": "sha512-1/aa2clS0pue0HjckL62CsbhWWU35HARvBDXcJtYKbYR7LnIutmpxmXbuDMV9kEviD2lP/wACOgWmmwljghHyQ==",
 			"requires": {
 				"semver": "^5.4.1"
 			}
 		},
 		"node-hid": {
-			"version": "0.7.9",
-			"resolved": "https://registry.npmjs.org/node-hid/-/node-hid-0.7.9.tgz",
-			"integrity": "sha512-vJnonTqmq3frCyTumJqG4g2IZcny3ynkfmbfDfQ90P3ZhRzcWYS/Um1ux6HFmAxmkaQnrZqIYHcGpL7kdqY8jA==",
+			"version": "0.7.8",
+			"resolved": "https://registry.npmjs.org/node-hid/-/node-hid-0.7.8.tgz",
+			"integrity": "sha512-79Z9hw/pqIDp0kxvb353ivGgslo4i0hYQTcCqfRFxIJSO2gF9VtPla5uQY/9jTcDlON5O5YaqxbdH+8bs+m+1Q==",
 			"requires": {
 				"bindings": "^1.5.0",
 				"nan": "^2.13.2",
@@ -540,9 +517,9 @@
 			"integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18="
 		},
 		"path-parse": {
-			"version": "1.0.6",
-			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
-			"integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw=="
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz",
+			"integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME="
 		},
 		"pend": {
 			"version": "1.2.0",
@@ -591,9 +568,9 @@
 			}
 		},
 		"process-nextick-args": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-			"integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+			"integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw=="
 		},
 		"pump": {
 			"version": "2.0.1",
@@ -627,13 +604,6 @@
 				"safe-buffer": "~5.1.1",
 				"string_decoder": "~1.1.1",
 				"util-deprecate": "~1.0.1"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				}
 			}
 		},
 		"rechoir": {
@@ -645,17 +615,17 @@
 			}
 		},
 		"resolve": {
-			"version": "1.12.0",
-			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
-			"integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+			"version": "1.7.0",
+			"resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.0.tgz",
+			"integrity": "sha512-QdgZ5bjR1WAlpLaO5yHepFvC+o3rCr6wpfE2tpJNMkXdulf2jKomQBdNRQITF3ZKHNlT71syG98yQP03gasgnA==",
 			"requires": {
-				"path-parse": "^1.0.6"
+				"path-parse": "^1.0.5"
 			}
 		},
 		"safe-buffer": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.0.tgz",
-			"integrity": "sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg=="
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
+			"integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
 		},
 		"seek-bzip": {
 			"version": "1.0.5",
@@ -676,9 +646,9 @@
 			}
 		},
 		"semver": {
-			"version": "5.7.1",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-			"integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="
+			"version": "5.7.0",
+			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+			"integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA=="
 		},
 		"set-blocking": {
 			"version": "2.0.0",
@@ -742,13 +712,6 @@
 			"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
 			"requires": {
 				"safe-buffer": "~5.1.0"
-			},
-			"dependencies": {
-				"safe-buffer": {
-					"version": "5.1.2",
-					"resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-					"integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-				}
 			}
 		},
 		"strip-ansi": {
@@ -803,16 +766,13 @@
 			}
 		},
 		"tar-stream": {
-			"version": "1.6.2",
-			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
-			"integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
+			"version": "1.5.5",
+			"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.5.5.tgz",
+			"integrity": "sha512-mQdgLPc/Vjfr3VWqWbfxW8yQNiJCbAZ+Gf6GDu1Cy0bdb33ofyiNGBtAY96jHFhDuivCwgW1H9DgTON+INiXgg==",
 			"requires": {
 				"bl": "^1.0.0",
-				"buffer-alloc": "^1.2.0",
 				"end-of-stream": "^1.0.0",
-				"fs-constants": "^1.0.0",
-				"readable-stream": "^2.3.0",
-				"to-buffer": "^1.1.1",
+				"readable-stream": "^2.0.0",
 				"xtend": "^4.0.0"
 			}
 		},
@@ -829,11 +789,6 @@
 				"os-tmpdir": "~1.0.2"
 			}
 		},
-		"to-buffer": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/to-buffer/-/to-buffer-1.1.1.tgz",
-			"integrity": "sha512-lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg=="
-		},
 		"tunnel-agent": {
 			"version": "0.6.0",
 			"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
@@ -849,12 +804,12 @@
 			"dev": true
 		},
 		"unbzip2-stream": {
-			"version": "1.3.3",
-			"resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz",
-			"integrity": "sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==",
+			"version": "1.2.5",
+			"resolved": "https://registry.npmjs.org/unbzip2-stream/-/unbzip2-stream-1.2.5.tgz",
+			"integrity": "sha512-izD3jxT8xkzwtXRUZjtmRwKnZoeECrfZ8ra/ketwOcusbZEp4mjULMnJOCfTDZBgGQAAY1AJ/IgxcwkavcX9Og==",
 			"requires": {
-				"buffer": "^5.2.1",
-				"through": "^2.3.8"
+				"buffer": "^3.0.1",
+				"through": "^2.3.6"
 			}
 		},
 		"util-deprecate": {
@@ -881,17 +836,17 @@
 			"integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
 		},
 		"xtend": {
-			"version": "4.0.2",
-			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+			"integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68="
 		},
 		"yauzl": {
-			"version": "2.10.0",
-			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-			"integrity": "sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=",
+			"version": "2.9.1",
+			"resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz",
+			"integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=",
 			"requires": {
 				"buffer-crc32": "~0.2.3",
-				"fd-slicer": "~1.1.0"
+				"fd-slicer": "~1.0.1"
 			}
 		}
 	}
--- a/packages/usb/package.json
+++ b/packages/usb/package.json
@@ -13,7 +13,7 @@
    "commander": "^2.11.0",
    "decompress": "^4.2.0",
    "decompress-tarbz2": "^4.1.1",
-    "node-hid": "0.7.9",
+    "node-hid": "0.7.8",
    "shelljs": "^0.7.8",
    "tmp": "0.0.33",
    "uhk-common": "1.0.0",
--- a/packages/usb/user-config-json-to-bin.ts
+++ b/packages/usb/user-config-json-to-bin.ts
@@ -1,3 +1,6 @@
+#!/usr/bin/env ts-node
+///<reference path="./node_modules/@types/node/index.d.ts"/>
+
 import { UhkBuffer, UserConfiguration } from 'uhk-common';
 import * as fs from 'fs';
@@ -1 +1 @@
 .0.0
 .11.0