diff --git a/package.json b/package.json
index 534ab12b6a97580ff59895978e4ac4d8ad171ad7..50b1ac95bb6e31c4c92d8a76f39fea4f89601296 100644
--- a/package.json
+++ b/package.json
@@ -12,10 +12,10 @@
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/parity-js/fether.git"
+    "url": "git+https://github.com/paritytech/fether.git"
   },
   "bugs": {
-    "url": "https://github.com/parity-js/fether/issues"
+    "url": "https://github.com/paritytech/fether/issues"
   },
   "keywords": [
     "Ethereum",
@@ -23,7 +23,7 @@
     "Light Client",
     "Parity"
   ],
-  "homepage": "https://github.com/parity-js/fether",
+  "homepage": "https://github.com/paritytech/fether",
   "workspaces": {
     "packages": [
       "packages/*"
@@ -61,4 +61,4 @@
     "npm-run-all": "^4.1.2",
     "semistandard": "^12.0.1"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/fether-electron/package.json b/packages/fether-electron/package.json
index ef5365c881afa925f00cec157876acd48f68eef6..5b21a6c79dcb3e77d0a2bc721eb086a16a9a78f4 100644
--- a/packages/fether-electron/package.json
+++ b/packages/fether-electron/package.json
@@ -12,10 +12,10 @@
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/parity-js/fether.git"
+    "url": "git+https://github.com/paritytech/fether.git"
   },
   "bugs": {
-    "url": "https://github.com/parity-js/fether/issues"
+    "url": "https://github.com/paritytech/fether/issues"
   },
   "keywords": [
     "Ethereum",
@@ -23,7 +23,7 @@
     "Light Client",
     "Parity"
   ],
-  "homepage": "https://github.com/parity-js/fether",
+  "homepage": "https://github.com/paritytech/fether",
   "parity": {
     "channel": "beta"
   },
@@ -55,4 +55,4 @@
     "electron-webpack": "^2.1.2",
     "webpack": "^4.7.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/fether-electron/src/main/installers/windows/installer.nsh b/packages/fether-electron/src/main/installers/windows/installer.nsh
index 1d718cd85cbccdc1b166ceefc4e31ee889562fdb..7877cc51f575fd40bfd49409d3c17e9ae19c6892 100644
--- a/packages/fether-electron/src/main/installers/windows/installer.nsh
+++ b/packages/fether-electron/src/main/installers/windows/installer.nsh
@@ -2,9 +2,9 @@
 ; https://www.electron.build/configuration/nsis#how-do-change-the-default-installation-directory-to-custom
 !macro preInit
     SetRegView 64
-    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI"
-    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI"
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Fether"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Fether"
     SetRegView 32
-    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI"
-    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Parity UI"
+    WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Fether"
+    WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "C:\Program Files\Parity Technologies\Fether"
 !macroend
diff --git a/packages/fether-react/package.json b/packages/fether-react/package.json
index ff0f1c193de77b9cb44a3ced2ce852ab8db06482..876c544c5e95cc59bc0d3bf624f894ddf144e734 100644
--- a/packages/fether-react/package.json
+++ b/packages/fether-react/package.json
@@ -12,10 +12,10 @@
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/parity-js/fether.git"
+    "url": "git+https://github.com/paritytech/fether.git"
   },
   "bugs": {
-    "url": "https://github.com/parity-js/fether/issues"
+    "url": "https://github.com/paritytech/fether/issues"
   },
   "keywords": [
     "Ethereum",
@@ -66,4 +66,4 @@
     "npm-run-all": "^4.1.2",
     "react-app-rewired": "^1.5.2"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/fether-ui/package.json b/packages/fether-ui/package.json
index 54c8a4b87a2ac607bf2e147b6af76df5f1dde371..929b3cb0e1f5a717da86659be92c84ce171ba947 100644
--- a/packages/fether-ui/package.json
+++ b/packages/fether-ui/package.json
@@ -12,10 +12,10 @@
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/parity-js/fether.git"
+    "url": "git+https://github.com/paritytech/fether.git"
   },
   "bugs": {
-    "url": "https://github.com/parity-js/fether/issues"
+    "url": "https://github.com/paritytech/fether/issues"
   },
   "keywords": [
     "Ethereum",
@@ -23,7 +23,7 @@
     "Light Client",
     "Parity"
   ],
-  "homepage": "https://github.com/parity-js/fether",
+  "homepage": "https://github.com/paritytech/fether",
   "main": "lib/index.js",
   "scripts": {
     "prebuild": "rimraf lib",
@@ -50,4 +50,4 @@
     "prop-types": "^15.6.1",
     "react": "^16.4.0"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/light-hoc/package.json b/packages/light-hoc/package.json
index dd1024bc86f4827bab2a11e974c605ee825d9cb8..e45e71adfed1592642e009e278bd80cf02696fe6 100644
--- a/packages/light-hoc/package.json
+++ b/packages/light-hoc/package.json
@@ -12,10 +12,10 @@
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/parity-js/fether.git"
+    "url": "git+https://github.com/paritytech/fether.git"
   },
   "bugs": {
-    "url": "https://github.com/parity-js/fether/issues"
+    "url": "https://github.com/paritytech/fether/issues"
   },
   "keywords": [
     "Ethereum",
@@ -23,7 +23,7 @@
     "Light Client",
     "Parity"
   ],
-  "homepage": "https://github.com/parity-js/fether",
+  "homepage": "https://github.com/paritytech/fether",
   "main": "lib/index.js",
   "scripts": {
     "prebuild": "rimraf lib",
@@ -42,4 +42,4 @@
     "@babel/preset-stage-0": "^7.0.0-beta.49",
     "rimraf": "^2.6.2"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/parity-electron/package.json b/packages/parity-electron/package.json
index 1809a99a7335b00e4e8ab80ee9568a18ec2a08ac..7bde358659bb807f9be37a2a1f9fdb23395ab670 100644
--- a/packages/parity-electron/package.json
+++ b/packages/parity-electron/package.json
@@ -12,10 +12,10 @@
   "license": "BSD-3-Clause",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/parity-js/fether.git"
+    "url": "git+https://github.com/paritytech/fether.git"
   },
   "bugs": {
-    "url": "https://github.com/parity-js/fether/issues"
+    "url": "https://github.com/paritytech/fether/issues"
   },
   "keywords": [
     "Ethereum",
@@ -23,7 +23,7 @@
     "Light Client",
     "Parity"
   ],
-  "homepage": "https://github.com/parity-js/fether",
+  "homepage": "https://github.com/paritytech/fether",
   "main": "lib/index.js",
   "scripts": {
     "prebuild": "rimraf lib",
@@ -47,4 +47,4 @@
   "peerDependencies": {
     "electron": "^2.0.3"
   }
-}
+}
\ No newline at end of file
diff --git a/packages/parity-electron/src/fetchParity.ts b/packages/parity-electron/src/fetchParity.ts
index 43414017229962b642a1d18ed35fd094dc9ddf31..9cf57b9da3e0008bdf54405f200abb81bb88ba70 100644
--- a/packages/parity-electron/src/fetchParity.ts
+++ b/packages/parity-electron/src/fetchParity.ts
@@ -70,12 +70,9 @@ export const deleteParity = async () => {
 export const fetchParity = async (
   mainWindow: BrowserWindow,
   {
-    onProgress,
-    parityChannel
-  }: { onProgress: (progress: number) => void; parityChannel: string } = {
-    onProgress: () => {},
-    parityChannel: 'beta'
-  }
+    onProgress = () => {},
+    parityChannel = 'beta'
+  }: { onProgress: (progress: number) => void; parityChannel: string }
 ) => {
   try {
     const parityPath: string = retry(
diff --git a/packages/parity-electron/src/getParityPath.ts b/packages/parity-electron/src/getParityPath.ts
index 851d436ad725386a81dbefba062e4a19b2d2fbf0..6a21e227a4d19200e3995db10ff502b7ac967db6 100644
--- a/packages/parity-electron/src/getParityPath.ts
+++ b/packages/parity-electron/src/getParityPath.ts
@@ -75,7 +75,7 @@ const isParityInUserData = async () => {
  * This function checks if parity has been installed on the local machine:
  * - first check if the program is in $PATH, using `command-exists`
  * - then check the OS default installation dir if a parity folder exists
- * - finally check parity-ui's own userData folder
+ * - finally check fether's own userData folder
  * This function should run in node env.
  *
  * @ignore
diff --git a/packages/parity-electron/src/isParityRunning.ts b/packages/parity-electron/src/isParityRunning.ts
index 73d40c35708af1a5205ee9babf462f8cdf7ad10b..c2f86743f7cc85f70f39979e59c535ad24bb430a 100644
--- a/packages/parity-electron/src/isParityRunning.ts
+++ b/packages/parity-electron/src/isParityRunning.ts
@@ -16,7 +16,7 @@ const hostsToPing = ['http://127.0.0.1:8545', 'http://127.0.0.1:8546'];
 if (cli.wsInterface || cli.wsPort) {
   // Also try custom host/port if a --ws-interface or --ws-port flag is passed
   hostsToPing.push(
-    `http://${cli.wsInterface || '127.0.0.1'}:${cli.wsPort || '8545'}`
+    `http://${cli.wsInterface || '127.0.0.1'}:${cli.wsPort || '8546'}`
   );
 }
 
diff --git a/packages/parity-electron/src/runParity.ts b/packages/parity-electron/src/runParity.ts
index 76745fb00f07cb750d2ec8cc52aa1b3272a80063..159bc1ce5c4507bd934325b3b8ec2e218d03b088 100644
--- a/packages/parity-electron/src/runParity.ts
+++ b/packages/parity-electron/src/runParity.ts
@@ -3,7 +3,6 @@
 //
 // SPDX-License-Identifier: BSD-3-Clause
 
-import { app } from 'electron';
 import { chmod } from 'fs';
 import { spawn } from 'child_process';
 import { promisify } from 'util';
@@ -94,12 +93,8 @@ export const runParity = async (
       return;
     }
 
-    // If the exit code is not 0, then we show some error message
-    if (Object.keys(parityArgv()).length > 0) {
-      app.exit(1);
-    } else {
-      onParityError(new Error(`Exit code ${exitCode}, with signal ${signal}.`));
-    }
+    // Otherwise, if the exit code is not 0, then we show some error message
+    onParityError(new Error(`Exit code ${exitCode}, with signal ${signal}.`));
   });
 };