add button to re-download torrent data if missing

2018-10-11 01:10:42 +02:00
83 changed files with 6641 additions and 4815 deletions
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1 +0,0 @@
-github: feross
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -13,3 +13,7 @@ newPRWelcomeComment: >
 firstPRMergeComment: >
  🎉 Congrats on getting your first pull request landed! <br><br>
  ![](https://feross.net/s/cats/29.gif)
+
+# ProBot WIP (https://probot.github.io/apps/wip/)
+
+# (Requires no configuration)
--- a/.github/lock.yml
+++ b/.github/lock.yml
@@ -1,4 +1,4 @@
 # ProBot Lock (https://probot.github.io/apps/lock/)

-daysUntilLock: 365
+daysUntilLock: 90
 lockComment: false
--- a/.github/no-response.yml
+++ b/.github/no-response.yml
@@ -1,6 +1,6 @@
 # ProBot No Response (https://probot.github.io/apps/no-response/)

-daysUntilClose: 14
+daysUntilClose: 7
 responseRequiredLabel: 'need more info'
 closeComment: >
  This issue has been automatically closed because there was no response to a
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -1,14 +1,11 @@
 # ProBot Stale (https://probot.github.io/apps/stale/)

 daysUntilStale: 90
-daysUntilClose: 14
+daysUntilClose: 7
 exemptLabels:
  - accepted
-  - blocked
  - bug
  - enhancement
-  - greenkeeper
-  - 'help wanted'
  - meta
 staleLabel: stale
 markComment: >
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,3 @@ node_modules/
 build/
 dist/
 npm-debug.log*
-
-# JetBrains IntelliJ IDEA project files
-.idea
-*.iml
--- a/.npmrc
+++ b/.npmrc
@@ -1 +0,0 @@
-package-lock=true
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -43,31 +43,9 @@
 - Borewit (borewit@users.noreply.github.com)
 - greenkeeper[bot] (greenkeeper[bot]@users.noreply.github.com)
 - Auyer (rafa_auyer@icloud.com)
- Jon Koops (jonkoops@gmail.com)
- Michael George Attard (michaelgeorgeattard@gmail.com)
 - SimplyAhmazing (ahmad19526@gmail.com)
 - Cezar Carneiro (cezargcarneiro@gmail.com)
- Bilal Elmoussaoui (bil.elmoussaoui@gmail.com)
 - Terry Hau (terryhau@gmail.com)
 - Vítor Galvão (info@vitorgalvao.com)
- Borewit (Borewit@users.noreply.github.com)
- Diego Rodríguez (diegorbaquero@gmail.com)
- Dan Flettre (flettre@gmail.com)
- Sibiraj (dev.sibiraj@outlook.com)
- clujin (clujin@gmail.com)
- Linus Unnebäck (linus@folkdatorn.se)
- Adrian Tombu (adrian@otso.fr)
- Lucas (5874806+RecoX@users.noreply.github.com)
- David Ernst (dsernst@users.noreply.github.com)
- David Ernst (git@dsernst.com)
- Jimmy Wärting (jimmy@warting.se)
- Recox (5874806+RecoX@users.noreply.github.com)
- greenkeeper[bot] (23040076+greenkeeper[bot]@users.noreply.github.com)
- hicom150 (hicom150@gmail.com)
- Jimmy Wärting (jimmy@warting.se)
- Julen Garcia Leunda (hicom150@gmail.com)
- Feross (feross@feross.org)
- Daniele Debernardi (drebrez@gmail.com)
- Chandan Chowdary Bhagam (chandandharana@gmail.com)

 #### Generated by bin/update-authors.sh.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,34 +1,5 @@
 # WebTorrent Desktop Version History

-## v0.21.0 - 2019-08
-
-### Added
-
- Add YouTube style hotkeys [\#1579](https://github.com/webtorrent/webtorrent-desktop/pull/1579) ([dsernst](https://github.com/dsernst))
- Toggle sound notifications on/off [\#1536](https://github.com/webtorrent/webtorrent-desktop/pull/1536) ([adriantombu](https://github.com/adriantombu))
- Ability to play MPEG-4 Audio Book \(.m4b\) [\#1450](https://github.com/webtorrent/webtorrent-desktop/pull/1450) ([Borewit](https://github.com/Borewit))
- Add support for subtitles on Chromecast [\#1165](https://github.com/webtorrent/webtorrent-desktop/pull/1165) ([janza](https://github.com/janza))
-
-### Changed
-
- Update to Electron 4 [\#1590](https://github.com/webtorrent/webtorrent-desktop/pull/1590) ([Borewit](https://github.com/Borewit))
- Remove '\(BETA\)' from app window title [\#1562](https://github.com/webtorrent/webtorrent-desktop/pull/1562) ([dsernst](https://github.com/dsernst))
- Update React (v16) and Material-UI (v0.20) [\#1483](https://github.com/webtorrent/webtorrent-desktop/pull/1483) ([mathiasvr](https://github.com/mathiasvr))
- Show audio track and disk number [\#1454](https://github.com/webtorrent/webtorrent-desktop/pull/1454) ([Borewit](https://github.com/Borewit))
- Asynchronous music metadata updates while streaming [\#1449](https://github.com/webtorrent/webtorrent-desktop/pull/1449) ([Borewit](https://github.com/Borewit))
- If torrent is not private, leave private flag unset [\#1411](https://github.com/webtorrent/webtorrent-desktop/pull/1411) ([feross](https://github.com/feross))
- Improve audio poster selection: [\#1368](https://github.com/webtorrent/webtorrent-desktop/pull/1368) ([Borewit](https://github.com/Borewit))
- Save preferences immediately when changed [\#1042](https://github.com/webtorrent/webtorrent-desktop/pull/1042) ([Flet](https://github.com/Flet))
-
-### Fixed
-
- Ensure that the minutes field in playback indicator is zero-padded. [\#1506](https://github.com/webtorrent/webtorrent-desktop/pull/1506) ([bnjmnt4n](https://github.com/bnjmnt4n))
- Bug Fix: Empty Array Reduce [\#1494](https://github.com/webtorrent/webtorrent-desktop/pull/1494) ([clujin](https://github.com/clujin))
- Fix startup problems [\#1419](https://github.com/webtorrent/webtorrent-desktop/pull/1419) ([Borewit](https://github.com/Borewit))
- Add back loading spinner for player page. [\#1311](https://github.com/webtorrent/webtorrent-desktop/pull/1311) ([bnjmnt4n](https://github.com/bnjmnt4n))
- Fix Linux desktop file [\#1309](https://github.com/webtorrent/webtorrent-desktop/pull/1309) ([bilelmoussaoui](https://github.com/bilelmoussaoui))
-
-
 ## v0.20.0 - 2018-04-26

 ### Added
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,188 @@
+# Contributing Guidelines
+
+Contributions welcome!
+
+**Before spending lots of time on something, ask for feedback on your idea first!**
+
+Please search issues and pull requests before adding something new to avoid duplicating
+efforts and conversations.
+
+This project welcomes non-code contributions, too! The following types of contributions
+are welcome:
+
+- **Ideas**: participate in an issue thread or start your own to have your voice heard.
+- **Writing**: contribute your expertise in an area by helping expand the included docs.
+- **Copy editing**: fix typos, clarify language, and improve the quality of the docs.
+- **Formatting**: help keep docs easy to read with consistent formatting.
+
+## Code Style
+
+[![standard][standard-image]][standard-url]
+
+This repository uses [`standard`][standard-url] to maintain code style and consistency,
+and to avoid style arguments. `npm test` runs `standard` automatically, so you don't have
+to!
+
+[standard-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
+[standard-url]: https://standardjs.com
+
+## Project Governance
+
+Individuals making significant and valuable contributions are given commit-access to the
+project to contribute as they see fit. This project is more like an open wiki than a
+standard guarded open source project.
+
+### Rules
+
+There are a few basic ground-rules for contributors:
+
+1. **No `--force` pushes to master** or modifying history in any way. Rebasing and force pushing your own PR branch is fine.
+2. **Non-master branches** should be used for ongoing work.
+3. **Significant modifications** like API changes should be subject to a **pull request**
+   to solicit feedback from other contributors.
+4. **Pull requests** are *encouraged* for all contributions to solicit feedback, but left to
+   the discretion of the contributor.
+
+### Releases
+
+Declaring formal releases remains the prerogative of the project maintainer.
+
+### Changes to this arrangement
+
+This is an experiment and feedback is welcome! This document may also be subject to pull-
+requests or changes by contributors where you believe you have something valuable to add
+or change.
+
+## Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+- (a) The contribution was created in whole or in part by me and I have the right to
+  submit it under the open source license indicated in the file; or
+
+- (b) The contribution is based upon previous work that, to the best of my knowledge, is
+  covered under an appropriate open source license and I have the right under that license
+  to submit that work with modifications, whether created in whole or in part by me, under
+  the same open source license (unless I am permitted to submit under a different
+  license), as indicated in the file; or
+
+- (c) The contribution was provided directly to me by some other person who certified
+  (a), (b) or (c) and I have not modified it.
+
+- (d) I understand and agree that this project and the contribution are public and that a
+  record of the contribution (including all personal information I submit with it,
+  including my sign-off) is maintained indefinitely and may be redistributed consistent
+  with this project or the open source license(s) involved.
+
+## Release Procedure
+
+### 1. Create a new version
+
+- Update `AUTHORS`
+
+  ```
+  npm run update-authors
+  ```
+
+  Commit if necessary. The commit message should be "authors".
+
+- Write the changelog
+
+  You can use `git log --oneline <last version tag>..HEAD` to get a list of changes.
+
+  Summarize them concisely in `CHANGELOG.md`. The commit  message should be "changelog".
+
+- Update the version
+
+  ```
+  npm version [major|minor|patch]
+  ```
+
+  This creates both a commit and a git tag.
+
+- Make a PR
+
+  Once the PR is reviewed, merge it:
+
+  ```
+  git push origin <branch-name>:master
+  ```
+
+  This makes it so that the commit hash on master matches the commit hash of the version tag.
+
+  Finally, run:
+
+  ```
+  git push --tags
+  ```
+
+### 2. Create the release binaries
+
+- On a Mac:
+
+  ```
+  npm run package -- darwin --sign
+  npm run package -- linux --sign
+  ```
+
+- On Windows, or in a Windows VM:
+
+  ```
+  npm run package -- win32 --sign
+  ```
+
+- Then, upload the release binaries to Github:
+
+  ```
+  npm run gh-release
+  ```
+
+  Follow the URL to a newly created Github release page. Manually upload the binaries from
+  `webtorrent-desktop/dist/`. Open the previous release in another tab, and make sure that you
+  are uploading the same set of files, no more, no less.
+
+### 3. Test it
+
+**This is the most important part.**
+
+ - Manually download the binaries for each platform from Github.
+
+  **Do not use your locally built binaries.** Modern OSs treat executables differently if they've
+  been downloaded, even though the files are byte for byte identical. This ensures that the
+  codesigning worked and is valid.
+
+- Smoke test WebTorrent Desktop on each platform.
+
+  See Smoke Tests below for details. Open DevTools
+  on Windows and Mac, and ensure that the auto updater is running. If the auto updater does not
+  run, users will successfully auto update to this new version, and then be stuck there forever.
+
+### 4. Ship it
+
+- Update the website
+
+  Create a pull request in [webtorrent.io](https://github.com/webtorrent/webtorrent.io). Update
+  `config.js`, updating the desktop app version.
+
+  As soon as this PR is merged, Jenkins will automatically redeploy the WebTorrent website, and
+  hundreds of thousands of users around the world will start auto updating. **Merge with care.**
+
+## Smoke Tests
+
+Before a release, check that the following basic use cases work correctly:
+
+1. Click "Play" to stream a built-in torrent (e.g. Sintel)
+  - Ensure that seeking to undownloaded region works and plays immediately.
+  - Ensure that sintel.mp4 gets downloaded to `~/Downloads`.
+
+2. Check that the auto-updater works
+  - Open the console and check for the line "No update available" to indicate
+
+3. Add a new .torrent file via drag-and-drop.
+  - Ensure that it gets added to the list and starts downloading
+
+4. Remove a torrent from the client
+  - Ensure that the file is removed from `~/Downloads`
+
+5. Create and seed a new a torrent via drag-and-drop.
+  - Ensure that the torrent gets created and seeding begins.
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@
 <h4 align="center">The streaming torrent app. For Mac, Windows, and Linux.</h4>

 <p align="center">
-  <a href="https://discord.gg/cnXkm4Z"><img src="https://img.shields.io/discord/612575111718895616" alt="discord"></a>
+  <a href="https://gitter.im/webtorrent/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="gitter"></a>
  <a href="https://travis-ci.org/webtorrent/webtorrent-desktop"><img src="https://img.shields.io/travis/webtorrent/webtorrent-desktop/master.svg" alt="travis"></a>
  <a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/webtorrent/webtorrent-desktop.svg" alt="github release version"></a>
  <a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/downloads/webtorrent/webtorrent-desktop/total.svg" alt="github release downloads"></a>
@@ -97,7 +97,7 @@ comparing each one to a reference. Why screenshots?
  https://github.com/blog/817-behold-image-view-modes

 For MacOS, you'll need a Retina screen for the integration tests to pass. Your screen should have
-the same resolution as a 2018 MacBook Pro 13".
+the same resolution as a 2016 12" Macbook.

 For Windows, you'll need Windows 10 with a 1366x768 screen.

@@ -125,7 +125,6 @@ The following optional arguments are available:
 - `--sign` - Sign the application (Mac, Windows)
 - `--package=[type]` - Package single output type.
   - `deb` - Debian package
-   - `rpm` - RedHat package
   - `zip` - Linux zip file
   - `dmg` - Mac disk image
   - `exe` - Windows installer
@@ -142,12 +141,11 @@ The Windows app can be packaged from **any** platform.
 Note: Windows code signing only works from **Windows**, for now.

 Note: To package the Windows app from non-Windows platforms,
-[Wine](https://www.winehq.org/) and [Mono](https://www.mono-project.com/) need
-to be installed. For example on Mac, first install
-[XQuartz](http://www.xquartz.org/), then run:
+[Wine](https://www.winehq.org/) needs to be installed. For example on Mac, first
+install [XQuartz](http://www.xquartz.org/), then run:

 ```
-brew install wine mono
+brew install wine
 ```

 (Requires the [Homebrew](http://brew.sh/) package manager.)
@@ -160,22 +158,6 @@ The Mac app can only be packaged from **macOS**.

 The Linux app can be packaged from **any** platform.

-If packaging from Mac, install system dependencies with Homebrew by running:
-
-```
-npm run install-system-deps
-```
-#### Recommended readings to start working in the app
-
-Electron (Framework to make native apps for Windows, OSX and Linux in Javascript):
-https://electronjs.org/docs/tutorial/quick-start
-
-React.js (Framework to work with Frontend UI):
-https://reactjs.org/docs/getting-started.html
-
-Material UI (React components that implement Google's Material Design.):
-https://material-ui.com/getting-started
-
 ### Privacy

 WebTorrent Desktop collects some basic usage stats to help us make the app better.
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -1,112 +0,0 @@
-## Release Process
-
-### 1. Create a new version
-
- Update `AUTHORS`
-
-  ```
-  npm run update-authors
-  ```
-
-  Commit if necessary. The commit message should be "authors".
-
- Write the changelog
-
-  You can use `git log --oneline <last version tag>..HEAD` to get a list of changes.
-
-  Summarize them concisely in `CHANGELOG.md`. The commit  message should be "changelog".
-
- Update the version
-
-  ```
-  npm version [major|minor|patch]
-  ```
-
-  This creates both a commit and a git tag.
-
- Make a PR
-
-  Once the PR is reviewed, merge it:
-
-  ```
-  git push origin <branch-name>:master
-  ```
-
-  This makes it so that the commit hash on master matches the commit hash of the version tag.
-
-  Finally, run:
-
-  ```
-  git push --tags
-  ```
-
-### 2. Create the release binaries
-
- On a Mac:
-
-  ```
-  npm run package -- darwin --sign
-  npm run package -- linux --sign
-  ```
-
- On Windows, or in a Windows VM:
-
-  ```
-  npm run package -- win32 --sign
-  ```
-
- Then, upload the release binaries to Github:
-
-  ```
-  npm run gh-release
-  ```
-
-  Follow the URL to a newly created Github release page. Manually upload the binaries from
-  `webtorrent-desktop/dist/`. Open the previous release in another tab, and make sure that you
-  are uploading the same set of files, no more, no less.
-
-### 3. Test it
-
-**This is the most important part.**
-
- - Manually download the binaries for each platform from Github.
-
-  **Do not use your locally built binaries.** Modern OSs treat executables differently if they've
-  been downloaded, even though the files are byte for byte identical. This ensures that the
-  codesigning worked and is valid.
-
- Smoke test WebTorrent Desktop on each platform.
-
-  See Smoke Tests below for details. Open DevTools
-  on Windows and Mac, and ensure that the auto updater is running. If the auto updater does not
-  run, users will successfully auto update to this new version, and then be stuck there forever.
-
-### 4. Ship it
-
- Update the website
-
-  Create a pull request in [webtorrent.io](https://github.com/webtorrent/webtorrent.io). Update
-  `config.js`, updating the desktop app version.
-
-  As soon as this PR is merged, Jenkins will automatically redeploy the WebTorrent website, and
-  hundreds of thousands of users around the world will start auto updating. **Merge with care.**
-
-## Smoke Tests
-
-Before a release, check that the following basic use cases work correctly:
-
-1. Click "Play" to stream a built-in torrent (e.g. Sintel)
-  - Ensure that seeking to undownloaded region works and plays immediately.
-  - Ensure that sintel.mp4 gets downloaded to `~/Downloads`.
-
-2. Check that the auto-updater works
-  - Open the console and check for the line "No update available" to indicate
-
-3. Add a new .torrent file via drag-and-drop.
-  - Ensure that it gets added to the list and starts downloading
-
-4. Remove a torrent from the client
-  - Ensure that the file is removed from `~/Downloads`
-
-5. Create and seed a new a torrent via drag-and-drop.
-  - Ensure that the torrent gets created and seeding begins.
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -0,0 +1,43 @@
+# Security Policies and Procedures
+
+This document outlines security procedures and general policies for the WebTorrent
+project.
+
+  * [Reporting a Bug](#reporting-a-bug)
+  * [Disclosure Policy](#disclosure-policy)
+  * [Comments on this Policy](#comments-on-this-policy)
+
+## Reporting a Bug
+
+The WebTorrent team and community take all security bugs in WebTorrent seriously.
+Thank you for improving the security of WebTorrent. We appreciate your efforts and
+responsible disclosure and will make every effort to acknowledge your
+contributions.
+
+Report security bugs by emailing the lead maintainer at feross@feross.org.
+
+The lead maintainer will acknowledge your email within 48 hours, and will send a
+more detailed response within 48 hours indicating the next steps in handling
+your report. After the initial reply to your report, the security team will
+endeavor to keep you informed of the progress towards a fix and full
+announcement, and may ask for additional information or guidance.
+
+Report security bugs in third-party modules to the person or team maintaining
+the module. You can also report a vulnerability through the
+[Node Security Project](https://nodesecurity.io/report).
+
+## Disclosure Policy
+
+When the security team receives a security bug report, they will assign it to a
+primary handler. This person will coordinate the fix and release process,
+involving the following steps:
+
+  * Confirm the problem and determine the affected versions.
+  * Audit code to find any potential similar problems.
+  * Prepare fixes for all releases still under maintenance. These fixes will be
+    released as fast as possible to npm.
+
+## Comments on this Policy
+
+If you have suggestions on how this process could be improved please submit a
+pull request.
--- a/bin/extra-lint.js
+++ b/bin/extra-lint.js
@@ -18,6 +18,13 @@ files.forEach(function (file) {
  lines.forEach(function (line, i) {
    let error

+    // Consistent JSX tag closing
+    if (line.match(/' {2}\/> *$/) ||
+      line.match('[^ ]/> *$') ||
+      line.match(' > *$')) {
+      error = 'JSX tag spacing'
+    }
+
    // No lines over 100 characters
    if (line.length > 100) {
      error = 'Line >100 chars'
@@ -28,7 +35,7 @@ files.forEach(function (file) {
    }

    if (error) {
-      const name = path.basename(file)
+      let name = path.basename(file)
      console.log('%s:%d - %s:\n%s', name, i + 1, error, line)
      hasErrors = true
    }
--- a/bin/open-config.js
+++ b/bin/open-config.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node

 const { CONFIG_PATH } = require('../src/config')
-const open = require('open')
+const opn = require('opn')

-open(CONFIG_PATH)
+opn(CONFIG_PATH)
--- a/bin/package.js
+++ b/bin/package.js
@@ -39,7 +39,8 @@ const argv = minimist(process.argv.slice(2), {
 function build () {
  console.log('Reinstalling node_modules...')
  rimraf.sync(NODE_MODULES_PATH)
-  cp.execSync('npm ci', { stdio: 'inherit' })
+  cp.execSync('npm install', { stdio: 'inherit' })
+  cp.execSync('npm dedupe', { stdio: 'inherit' })

  console.log('Nuking dist/ and build/...')
  rimraf.sync(DIST_PATH)
@@ -70,11 +71,11 @@ function build () {
 const all = {
  // The human-readable copyright line for the app. Maps to the `LegalCopyright` metadata
  // property on Windows, and `NSHumanReadableCopyright` on Mac.
-  appCopyright: config.APP_COPYRIGHT,
+  'app-copyright': config.APP_COPYRIGHT,

  // The release version of the application. Maps to the `ProductVersion` metadata
  // property on Windows, and `CFBundleShortVersionString` on Mac.
-  appVersion: pkg.version,
+  'app-version': pkg.version,

  // Package the application's source code into an archive, using Electron's archive
  // format. Mitigates issues around long path names on Windows and slightly speeds up
@@ -88,7 +89,7 @@ const all = {
  // The build version of the application. Maps to the FileVersion metadata property on
  // Windows, and CFBundleVersion on Mac. Note: Windows requires the build version to
  // start with a number. We're using the version of the underlying WebTorrent library.
-  buildVersion: require('webtorrent/package.json').version,
+  'build-version': require('webtorrent/package.json').version,

  // The application source directory.
  dir: config.ROOT_PATH,
@@ -118,18 +119,18 @@ const darwin = {
  // Build for Mac
  platform: 'darwin',

-  // Build x64 binary only.
+  // Build x64 binaries only.
  arch: 'x64',

  // The bundle identifier to use in the application's plist (Mac only).
-  appBundleId: 'io.webtorrent.webtorrent',
+  'app-bundle-id': 'io.webtorrent.webtorrent',

  // The application category type, as shown in the Finder via "View" -> "Arrange by
  // Application Category" when viewing the Applications directory (Mac only).
-  appCategoryType: 'public.app-category.utilities',
+  'app-category-type': 'public.app-category.utilities',

  // The bundle identifier to use in the application helper's plist (Mac only).
-  helperBundleId: 'io.webtorrent.webtorrent-helper',
+  'helper-bundle-id': 'io.webtorrent.webtorrent-helper',

  // Application icon.
  icon: config.APP_ICON + '.icns'
@@ -139,8 +140,8 @@ const win32 = {
  // Build for Windows.
  platform: 'win32',

-  // Build x64 binary only.
-  arch: 'x64',
+  // Build ia32 and x64 binaries.
+  arch: ['ia32', 'x64'],

  // Object hash of application metadata to embed into the executable (Windows only)
  win32metadata: {
@@ -173,8 +174,8 @@ const linux = {
  // Build for Linux.
  platform: 'linux',

-  // Build x64 and arm64 binaries.
-  arch: ['x64', 'arm64']
+  // Build ia32 and x64 binaries.
+  arch: ['ia32', 'x64']

  // Note: Application icon for Linux is specified via the BrowserWindow `icon` option.
 }
@@ -185,7 +186,8 @@ function buildDarwin (cb) {
  const plist = require('plist')

  console.log('Mac: Packaging electron...')
-  electronPackager(Object.assign({}, all, darwin)).then(function (buildPath) {
+  electronPackager(Object.assign({}, all, darwin), function (err, buildPath) {
+    if (err) return cb(err)
    console.log('Mac: Packaged electron. ' + buildPath)

    const appPath = path.join(buildPath[0], config.APP_NAME + '.app')
@@ -196,16 +198,16 @@ function buildDarwin (cb) {

    infoPlist.CFBundleDocumentTypes = [
      {
-        CFBundleTypeExtensions: ['torrent'],
+        CFBundleTypeExtensions: [ 'torrent' ],
        CFBundleTypeIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
        CFBundleTypeName: 'BitTorrent Document',
        CFBundleTypeRole: 'Editor',
        LSHandlerRank: 'Owner',
-        LSItemContentTypes: ['org.bittorrent.torrent']
+        LSItemContentTypes: [ 'org.bittorrent.torrent' ]
      },
      {
        CFBundleTypeName: 'Any',
-        CFBundleTypeOSTypes: ['****'],
+        CFBundleTypeOSTypes: [ '****' ],
        CFBundleTypeRole: 'Editor',
        LSHandlerRank: 'Owner',
        LSTypeIsPackage: false
@@ -217,13 +219,13 @@ function buildDarwin (cb) {
        CFBundleTypeRole: 'Editor',
        CFBundleURLIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
        CFBundleURLName: 'BitTorrent Magnet URL',
-        CFBundleURLSchemes: ['magnet']
+        CFBundleURLSchemes: [ 'magnet' ]
      },
      {
        CFBundleTypeRole: 'Editor',
        CFBundleURLIconFile: path.basename(config.APP_FILE_ICON) + '.icns',
        CFBundleURLName: 'BitTorrent Stream-Magnet URL',
-        CFBundleURLSchemes: ['stream-magnet']
+        CFBundleURLSchemes: [ 'stream-magnet' ]
      }
    ]

@@ -240,7 +242,7 @@ function buildDarwin (cb) {
        UTTypeReferenceURL: 'http://www.bittorrent.org/beps/bep_0000.html',
        UTTypeTagSpecification: {
          'com.apple.ostype': 'TORR',
-          'public.filename-extension': ['torrent'],
+          'public.filename-extension': [ 'torrent' ],
          'public.mime-type': 'application/x-bittorrent'
        }
      }
@@ -354,8 +356,6 @@ function buildDarwin (cb) {
        cb(null)
      })
    }
-  }).catch(function (err) {
-    cb(err)
  })
 }

@@ -376,7 +376,8 @@ function buildWin32 (cb) {
    CERT_PATH = path.join(os.homedir(), 'Desktop')
  }

-  electronPackager(Object.assign({}, all, win32)).then(function (buildPath) {
+  electronPackager(Object.assign({}, all, win32), function (err, buildPath) {
+    if (err) return cb(err)
    console.log('Windows: Packaged electron. ' + buildPath)

    let signWithParams
@@ -395,17 +396,21 @@ function buildWin32 (cb) {

    const tasks = []
    buildPath.forEach(function (filesPath) {
+      const destArch = filesPath.split('-').pop()
+
      if (argv.package === 'exe' || argv.package === 'all') {
-        tasks.push((cb) => packageInstaller(filesPath, cb))
+        tasks.push((cb) => packageInstaller(filesPath, destArch, cb))
      }
      if (argv.package === 'portable' || argv.package === 'all') {
-        tasks.push((cb) => packagePortable(filesPath, cb))
+        tasks.push((cb) => packagePortable(filesPath, destArch, cb))
      }
    })
    series(tasks, cb)

-    function packageInstaller (filesPath, cb) {
-      console.log('Windows: Creating installer...')
+    function packageInstaller (filesPath, destArch, cb) {
+      console.log(`Windows: Creating ${destArch} installer...`)
+
+      const archStr = destArch === 'ia32' ? '-ia32' : ''

      installer.createWindowsInstaller({
        appDirectory: filesPath,
@@ -418,17 +423,26 @@ function buildWin32 (cb) {
        noMsi: true,
        outputDirectory: DIST_PATH,
        productName: config.APP_NAME,
+        /**
+         * Only create delta updates for the Windows x64 build because 90% of our
+         * users have Windows x64 and the delta files take a *very* long time to
+         * generate. Also, the ia32 files on GitHub have non-standard Squirrel
+         * names (i.e. RELEASES-ia32 instead of RELEASES) and so Squirrel won't
+         * find them unless we proxy the requests.
+         */
        // TODO: Re-enable Windows 64-bit delta updates when we confirm that they
        //       work correctly in the presence of the "ia32" .nupkg files. I
        //       (feross) noticed them listed in the 64-bit RELEASES file and
        //       manually edited them out for the v0.17 release. Shipping only
        //       full updates for now will work fine, with no ill-effects.
-        // remoteReleases: config.GITHUB_URL,
+        // remoteReleases: destArch === 'x64'
+        //   ? config.GITHUB_URL
+        //   : undefined,
        /**
         * If you hit a "GitHub API rate limit exceeded" error, set this token!
         */
        // remoteToken: process.env.WEBTORRENT_GITHUB_API_TOKEN,
-        setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + '.exe',
+        setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + archStr + '.exe',
        setupIcon: config.APP_ICON + '.ico',
        signWithParams: signWithParams,
        title: config.APP_NAME,
@@ -436,7 +450,7 @@ function buildWin32 (cb) {
        version: pkg.version
      })
        .then(function () {
-          console.log('Windows: Created installer.')
+          console.log(`Windows: Created ${destArch} installer.`)

          /**
         * Delete extraneous Squirrel files (i.e. *.nupkg delta files for older
@@ -448,13 +462,42 @@ function buildWin32 (cb) {
              fs.unlinkSync(path.join(DIST_PATH, filename))
            })

+          if (destArch === 'ia32') {
+            console.log('Windows: Renaming ia32 installer files...')
+
+            // RELEASES -> RELEASES-ia32
+            const relPath = path.join(DIST_PATH, 'RELEASES-ia32')
+            fs.renameSync(
+              path.join(DIST_PATH, 'RELEASES'),
+              relPath
+            )
+
+            // WebTorrent-vX.X.X-full.nupkg -> WebTorrent-vX.X.X-ia32-full.nupkg
+            fs.renameSync(
+              path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-full.nupkg`),
+              path.join(DIST_PATH, `${config.APP_NAME}-${config.APP_VERSION}-ia32-full.nupkg`)
+            )
+
+            // Change file name inside RELEASES-ia32 to match renamed file
+            const relContent = fs.readFileSync(relPath, 'utf8')
+            const relContent32 = relContent.replace('full.nupkg', 'ia32-full.nupkg')
+            fs.writeFileSync(relPath, relContent32)
+
+            if (relContent === relContent32) {
+            // Sanity check
+              throw new Error('Fixing RELEASES-ia32 failed. Replacement did not modify the file.')
+            }
+
+            console.log('Windows: Renamed ia32 installer files.')
+          }
+
          cb(null)
        })
        .catch(cb)
    }

-    function packagePortable (filesPath, cb) {
-      console.log('Windows: Creating portable app...')
+    function packagePortable (filesPath, destArch, cb) {
+      console.log(`Windows: Creating ${destArch} portable app...`)

      const portablePath = path.join(filesPath, 'Portable Settings')
      mkdirp.sync(portablePath)
@@ -465,22 +508,22 @@ function buildWin32 (cb) {
      const tempPath = path.join(portablePath, 'Temp')
      mkdirp.sync(tempPath)

+      const archStr = destArch === 'ia32' ? '-ia32' : ''
+
      const inPath = path.join(DIST_PATH, path.basename(filesPath))
-      const outPath = path.join(DIST_PATH, BUILD_NAME + '-win.zip')
+      const outPath = path.join(DIST_PATH, BUILD_NAME + '-win' + archStr + '.zip')
      zip.zipSync(inPath, outPath)

-      console.log('Windows: Created portable app.')
+      console.log(`Windows: Created ${destArch} portable app.`)
      cb(null)
    }
-  }).catch(function (err) {
-    cb(err)
  })
 }

 function buildLinux (cb) {
  console.log('Linux: Packaging electron...')
-
-  electronPackager(Object.assign({}, all, linux)).then(function (buildPath) {
+  electronPackager(Object.assign({}, all, linux), function (err, buildPath) {
+    if (err) return cb(err)
    console.log('Linux: Packaged electron. ' + buildPath)

    const tasks = []
@@ -490,92 +533,56 @@ function buildLinux (cb) {
      if (argv.package === 'deb' || argv.package === 'all') {
        tasks.push((cb) => packageDeb(filesPath, destArch, cb))
      }
-      if (argv.package === 'rpm' || argv.package === 'all') {
-        tasks.push((cb) => packageRpm(filesPath, destArch, cb))
-      }
      if (argv.package === 'zip' || argv.package === 'all') {
        tasks.push((cb) => packageZip(filesPath, destArch, cb))
      }
    })
    series(tasks, cb)
-  }).catch(function (err) {
-    cb(err)
  })

  function packageDeb (filesPath, destArch, cb) {
-    // Linux convention for Debian based 'x64' is 'amd64'
-    if (destArch === 'x64') {
-      destArch = 'amd64'
-    }
-
    // Create .deb file for Debian-based platforms
    console.log(`Linux: Creating ${destArch} deb...`)

-    const installer = require('electron-installer-debian')
+    const deb = require('nobin-debian-installer')()
+    const destPath = path.join('/opt', pkg.name)

-    const options = {
-      src: filesPath + '/',
-      dest: DIST_PATH,
-      arch: destArch,
-      bin: 'WebTorrent',
-      icon: {
-        '48x48': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png'),
-        '256x256': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png')
-      },
-      categories: ['Network', 'FileTransfer', 'P2P'],
-      mimeType: ['application/x-bittorrent', 'x-scheme-handler/magnet', 'x-scheme-handler/stream-magnet'],
-      desktopTemplate: path.join(config.STATIC_PATH, 'linux/webtorrent-desktop.ejs')
-    }
-
-    installer(options).then(
-      () => {
-        console.log(`Linux: Created ${destArch} deb.`)
-        cb(null)
-      },
-      (err) => cb(err)
-    )
-  }
-
-  function packageRpm (filesPath, destArch, cb) {
-    // Linux convention for RedHat based 'x64' is 'x86_64'
-    if (destArch === 'x64') {
-      destArch = 'x86_64'
-    }
-
-    // Create .rpm file for RedHat-based platforms
-    console.log(`Linux: Creating ${destArch} rpm...`)
-
-    const installer = require('electron-installer-redhat')
-
-    const options = {
-      src: filesPath + '/',
-      dest: DIST_PATH,
-      arch: destArch,
-      bin: 'WebTorrent',
-      icon: {
-        '48x48': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png'),
-        '256x256': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png')
-      },
-      categories: ['Network', 'FileTransfer', 'P2P'],
-      mimeType: ['application/x-bittorrent', 'x-scheme-handler/magnet', 'x-scheme-handler/stream-magnet'],
-      desktopTemplate: path.join(config.STATIC_PATH, 'linux/webtorrent-desktop.ejs')
-    }
-
-    installer(options).then(
-      () => {
-        console.log(`Linux: Created ${destArch} rpm.`)
-        cb(null)
-      },
-      (err) => cb(err)
-    )
+    deb.pack({
+      package: pkg,
+      info: {
+        arch: destArch === 'x64' ? 'amd64' : 'i386',
+        targetDir: DIST_PATH,
+        depends: 'gconf2, libgtk2.0-0, libnss3, libxss1',
+        scripts: {
+          postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
+          prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
+        }
+      }
+    }, [{
+      src: ['./**'],
+      dest: destPath,
+      expand: true,
+      cwd: filesPath
+    }, {
+      src: ['./**'],
+      dest: path.join('/usr', 'share'),
+      expand: true,
+      cwd: path.join(config.STATIC_PATH, 'linux', 'share')
+    }], function (err) {
+      if (err) return cb(err)
+      console.log(`Linux: Created ${destArch} deb.`)
+      cb(null)
+    })
  }

  function packageZip (filesPath, destArch, cb) {
    // Create .zip file for Linux
    console.log(`Linux: Creating ${destArch} zip...`)

+    const archStr = destArch === 'ia32' ? '-ia32' : ''
+
    const inPath = path.join(DIST_PATH, path.basename(filesPath))
-    const outPath = path.join(DIST_PATH, `${BUILD_NAME}-linux-${destArch}.zip`)
+    const outPath = path.join(DIST_PATH, BUILD_NAME + '-linux' + archStr + '.zip')
    zip.zipSync(inPath, outPath)

    console.log(`Linux: Created ${destArch} zip.`)
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "webtorrent-desktop",
  "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
-  "version": "0.21.0",
+  "version": "0.20.0",
  "author": {
    "name": "WebTorrent, LLC",
    "email": "feross@webtorrent.io",
@@ -11,63 +11,66 @@
    "url": "https://github.com/webtorrent/webtorrent-desktop/issues"
  },
  "dependencies": {
-    "airplayer": "github:webtorrent/airplayer#fix-security",
-    "application-config": "^1.0.1",
-    "arch": "^2.1.1",
-    "auto-launch": "^5.0.5",
-    "bitfield": "^3.0.0",
-    "capture-frame": "^3.0.0",
-    "chokidar": "^3.0.2",
+    "airplayer": "^2.0.0",
+    "application-config": "^1.0.0",
+    "arch": "^2.0.0",
+    "auto-launch": "^4.0.1",
+    "bitfield": "^1.0.2",
+    "capture-frame": "^2.0.0",
+    "chokidar": "^2.0.4",
    "chromecasts": "^1.9.1",
-    "create-torrent": "^4.4.1",
-    "debounce": "^1.2.0",
-    "deep-equal": "^1.1.0",
+    "cp-file": "^6.0.0",
+    "create-torrent": "^3.24.5",
+    "debounce": "^1.0.0",
+    "deep-equal": "^1.0.1",
    "dlnacasts": "^0.1.0",
-    "drag-drop": "^5.0.1",
-    "es6-error": "^4.1.1",
+    "drag-drop": "^4.1.0",
+    "es6-error": "^4.0.0",
    "fn-getter": "^1.0.0",
-    "iso-639-1": "^2.1.0",
-    "languagedetect": "^1.2.0",
-    "location-history": "^1.1.1",
-    "material-ui": "^0.20.2",
+    "iso-639-1": "^1.2.1",
+    "languagedetect": "^1.1.1",
+    "location-history": "^1.0.0",
+    "material-ui": "^0.17.0",
    "mkdirp": "^0.5.1",
-    "music-metadata": "^4.5.3",
-    "network-address": "^1.1.2",
-    "parse-torrent": "^7.0.1",
-    "prettier-bytes": "^1.0.4",
-    "prop-types": "^15.7.2",
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
-    "rimraf": "^3.0.0",
-    "run-parallel": "^1.1.9",
-    "semver": "^6.3.0",
+    "music-metadata": "^3.1.0",
+    "network-address": "^1.1.0",
+    "parse-torrent": "^6.0.1",
+    "prettier-bytes": "^1.0.1",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2",
+    "react-tap-event-plugin": "^2.0.1",
+    "rimraf": "^2.5.2",
+    "run-parallel": "^1.1.6",
+    "semver": "^5.1.0",
    "simple-concat": "^1.0.0",
    "simple-get": "^3.0.3",
-    "srt-to-vtt": "^1.1.3",
-    "vlc-command": "^1.2.0",
-    "webtorrent": ">=0.107.16",
-    "winreg": "^1.2.4"
+    "srt-to-vtt": "^1.1.1",
+    "vlc-command": "^1.0.1",
+    "webtorrent": "0.x",
+    "winreg": "^1.2.0",
+    "zero-fill": "^2.2.3"
  },
  "devDependencies": {
-    "babel-eslint": "^10.0.3",
-    "buble": "^0.19.8",
-    "cross-zip": "^2.1.6",
-    "depcheck": "^0.8.3",
-    "electron": "~6.0.9",
-    "electron-osx-sign": "^0.4.13",
-    "electron-packager": "^14.0.6",
-    "electron-winstaller": "^4.0.0",
-    "gh-release": "^3.5.0",
+    "babel-eslint": "^9.0.0",
+    "buble": "^0.19.3",
+    "cross-zip": "^2.0.1",
+    "depcheck": "^0.6.4",
+    "electron": "1.6.16",
+    "electron-osx-sign": "^0.4.10",
+    "electron-packager": "~8.5.1",
+    "electron-winstaller": "^2.6.4",
+    "gh-release": "^3.2.1",
    "minimist": "^1.2.0",
-    "nodemon": "^1.19.2",
-    "open": "^6.4.0",
+    "nobin-debian-installer": "0.0.10",
+    "nodemon": "^1.10.2",
+    "opn": "^5.4.0",
    "plist": "^3.0.1",
-    "pngjs": "^3.4.0",
-    "run-series": "^1.1.8",
-    "spectron": "^8.0.0",
+    "pngjs": "^3.0.0",
+    "run-series": "^1.1.4",
+    "spectron": "^3.3.0",
    "standard": "*",
-    "tape": "^4.11.0",
-    "walk-sync": "^2.0.2"
+    "tape": "^4.6.0",
+    "walk-sync": "^0.3.1"
  },
  "engines": {
    "node": ">=4.0.0"
@@ -86,9 +89,7 @@
  "license": "MIT",
  "main": "index.js",
  "optionalDependencies": {
-    "appdmg": "^0.6.0",
-    "electron-installer-debian": "^2.0.0",
-    "electron-installer-redhat": "^2.0.0"
+    "appdmg": "^0.4.3"
  },
  "private": true,
  "productName": "WebTorrent",
@@ -97,12 +98,12 @@
    "url": "git://github.com/webtorrent/webtorrent-desktop.git"
  },
  "scripts": {
-    "build": "buble src --target chrome:71 --output build",
+    "build": "buble src --output build",
    "clean": "node ./bin/clean.js",
    "gh-release": "gh-release",
-    "install-system-deps": "brew install fakeroot dpkg rpm",
    "open-config": "node ./bin/open-config.js",
    "package": "node ./bin/package.js",
+    "prepublish": "npm run build",
    "start": "npm run build && electron .",
    "test": "standard && depcheck --ignores=standard,babel-eslint --ignore-dirs=build,dist && node ./bin/extra-lint.js",
    "test-integration": "npm run build && node ./test",
--- a/src/config.js
+++ b/src/config.js
@@ -23,13 +23,13 @@ module.exports = {
  CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
  TELEMETRY_URL: 'https://webtorrent.io/desktop/telemetry',

-  APP_COPYRIGHT: 'Copyright © 2014-2019 ' + APP_TEAM,
+  APP_COPYRIGHT: 'Copyright © 2014-2018 ' + APP_TEAM,
  APP_FILE_ICON: path.join(__dirname, '..', 'static', 'WebTorrentFile'),
  APP_ICON: path.join(__dirname, '..', 'static', 'WebTorrent'),
  APP_NAME: APP_NAME,
  APP_TEAM: APP_TEAM,
  APP_VERSION: APP_VERSION,
-  APP_WINDOW_TITLE: APP_NAME,
+  APP_WINDOW_TITLE: APP_NAME + ' (BETA)',

  CONFIG_PATH: getConfigPath(),

@@ -73,10 +73,8 @@ module.exports = {
  GITHUB_URL: 'https://github.com/webtorrent/webtorrent-desktop',
  GITHUB_URL_ISSUES: 'https://github.com/webtorrent/webtorrent-desktop/issues',
  GITHUB_URL_RAW: 'https://raw.githubusercontent.com/webtorrent/webtorrent-desktop/master',
-  GITHUB_URL_RELEASES: 'https://github.com/webtorrent/webtorrent-desktop/releases',

  HOME_PAGE_URL: 'https://webtorrent.io',
-  TWITTER_PAGE_URL: 'https://twitter.com/WebTorrentApp',

  IS_PORTABLE: IS_PORTABLE,
  IS_PRODUCTION: IS_PRODUCTION,
--- a/src/main/dialog.js
+++ b/src/main/dialog.js
@@ -19,7 +19,7 @@ function openSeedFile () {
  log('openSeedFile')
  const opts = {
    title: 'Select a file for the torrent.',
-    properties: ['openFile']
+    properties: [ 'openFile' ]
  }
  showOpenSeed(opts)
 }
@@ -35,11 +35,11 @@ function openSeedDirectory () {
  const opts = process.platform === 'darwin'
    ? {
      title: 'Select a file or folder for the torrent.',
-      properties: ['openFile', 'openDirectory']
+      properties: [ 'openFile', 'openDirectory' ]
    }
    : {
      title: 'Select a folder for the torrent.',
-      properties: ['openDirectory']
+      properties: [ 'openDirectory' ]
    }
  showOpenSeed(opts)
 }
@@ -54,11 +54,11 @@ function openFiles () {
  const opts = process.platform === 'darwin'
    ? {
      title: 'Select a file or folder to add.',
-      properties: ['openFile', 'openDirectory']
+      properties: [ 'openFile', 'openDirectory' ]
    }
    : {
      title: 'Select a file to add.',
-      properties: ['openFile']
+      properties: [ 'openFile' ]
    }
  setTitle(opts.title)
  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
@@ -77,7 +77,7 @@ function openTorrentFile () {
  const opts = {
    title: 'Select a .torrent file.',
    filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
-    properties: ['openFile', 'multiSelections']
+    properties: [ 'openFile', 'multiSelections' ]
  }
  setTitle(opts.title)
  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
--- a/src/main/handlers.js
+++ b/src/main/handlers.js
@@ -12,6 +12,8 @@ function install () {
      break
    case 'win32': installWin32()
      break
+    case 'linux': installLinux()
+      break
  }
 }

@@ -21,6 +23,8 @@ function uninstall () {
      break
    case 'win32': uninstallWin32()
      break
+    case 'linux': uninstallLinux()
+      break
  }
 }

@@ -38,7 +42,7 @@ function installDarwin () {

 function uninstallDarwin () {}

-const EXEC_COMMAND = [process.execPath, '--']
+const EXEC_COMMAND = [ process.execPath, '--' ]

 if (!config.IS_PRODUCTION) {
  EXEC_COMMAND.push(config.ROOT_PATH)
@@ -265,3 +269,100 @@ function uninstallWin32 () {
 function commandToArgs (command) {
  return command.map((arg) => `"${arg}"`).join(' ')
 }
+
+function installLinux () {
+  const fs = require('fs')
+  const os = require('os')
+  const path = require('path')
+
+  const config = require('../config')
+  const log = require('./log')
+
+  // Do not install in user dir if running on system
+  if (/^\/opt/.test(process.execPath)) return
+
+  installDesktopFile()
+  installIconFile()
+
+  function installDesktopFile () {
+    const templatePath = path.join(
+      config.STATIC_PATH, 'linux', 'webtorrent-desktop.desktop'
+    )
+    fs.readFile(templatePath, 'utf8', writeDesktopFile)
+  }
+
+  function writeDesktopFile (err, desktopFile) {
+    if (err) return log.error(err.message)
+
+    const appPath = config.IS_PRODUCTION
+      ? path.dirname(process.execPath)
+      : config.ROOT_PATH
+
+    desktopFile = desktopFile
+      .replace(/\$APP_NAME/g, config.APP_NAME)
+      .replace(/\$APP_PATH/g, appPath)
+      .replace(/\$EXEC_PATH/g, EXEC_COMMAND.join(' '))
+      .replace(/\$TRY_EXEC_PATH/g, process.execPath)
+
+    const desktopFilePath = path.join(
+      os.homedir(),
+      '.local',
+      'share',
+      'applications',
+      'webtorrent-desktop.desktop'
+    )
+    fs.mkdirp(path.dirname(desktopFilePath))
+    fs.writeFile(desktopFilePath, desktopFile, err => {
+      if (err) return log.error(err.message)
+    })
+  }
+
+  function installIconFile () {
+    const iconStaticPath = path.join(config.STATIC_PATH, 'WebTorrent.png')
+    fs.readFile(iconStaticPath, writeIconFile)
+  }
+
+  function writeIconFile (err, iconFile) {
+    if (err) return log.error(err.message)
+
+    const mkdirp = require('mkdirp')
+
+    const iconFilePath = path.join(
+      os.homedir(),
+      '.local',
+      'share',
+      'icons',
+      'webtorrent-desktop.png'
+    )
+    mkdirp(path.dirname(iconFilePath), err => {
+      if (err) return log.error(err.message)
+      fs.writeFile(iconFilePath, iconFile, err => {
+        if (err) log.error(err.message)
+      })
+    })
+  }
+}
+
+function uninstallLinux () {
+  const os = require('os')
+  const path = require('path')
+  const rimraf = require('rimraf')
+
+  const desktopFilePath = path.join(
+    os.homedir(),
+    '.local',
+    'share',
+    'applications',
+    'webtorrent-desktop.desktop'
+  )
+  rimraf(desktopFilePath)
+
+  const iconFilePath = path.join(
+    os.homedir(),
+    '.local',
+    'share',
+    'icons',
+    'webtorrent-desktop.png'
+  )
+  rimraf(iconFilePath)
+}
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -13,14 +13,9 @@ const menu = require('./menu')
 const State = require('../renderer/lib/state')
 const windows = require('./windows')

-const WEBTORRENT_VERSION = require('webtorrent/package.json').version
-
 let shouldQuit = false
 let argv = sliceArgv(process.argv)

-// allow electron/chromium to play startup sounds (without user interaction)
-app.commandLine.appendSwitch('autoplay-policy', 'no-user-gesture-required')
-
 // Start the app without showing the main window when auto launching on login
 // (On Windows and Linux, we get a flag. On MacOS, we get special API.)
 const hidden = argv.includes('--hidden') ||
@@ -43,19 +38,17 @@ if (!shouldQuit && !config.IS_PORTABLE) {
  // signal this instance and quit. Note: This feature creates a lock file in
  // %APPDATA%\Roaming\WebTorrent so we do not do it for the Portable App since
  // we want to be "silent" as well as "portable".
-  if (!app.requestSingleInstanceLock()) {
-    shouldQuit = true
+  shouldQuit = app.makeSingleInstance(onAppOpen)
+  if (shouldQuit) {
+    app.quit()
  }
 }

-if (shouldQuit) {
-  app.quit()
-} else {
+if (!shouldQuit) {
  init()
 }

 function init () {
-  app.on('second-instance', (event, commandLine, workingDirectory) => onAppOpen(commandLine))
  if (config.IS_PORTABLE) {
    const path = require('path')
    // Put all user data into the "Portable Settings" folder
@@ -98,12 +91,6 @@ function init () {
    })
  }

-  // Enable app logging into default directory, i.e. /Library/Logs/WebTorrent
-  // on Mac, %APPDATA% on Windows, $XDG_CONFIG_HOME or ~/.config on Linux.
-  app.setAppLogsPath()
-
-  app.userAgentFallback = `WebTorrent/${WEBTORRENT_VERSION} (https://webtorrent.io)`
-
  app.on('open-file', onOpen)
  app.on('open-url', onOpen)

@@ -175,7 +162,7 @@ function onOpen (e, torrentId) {
    // Electron issue: https://github.com/atom/electron/issues/4338
    setTimeout(() => windows.main.show(), 100)

-    processArgv([torrentId])
+    processArgv([ torrentId ])
  } else {
    argv.push(torrentId)
  }
@@ -205,7 +192,7 @@ function sliceArgv (argv) {
 }

 function processArgv (argv) {
-  const torrentIds = []
+  let torrentIds = []
  argv.forEach(function (arg) {
    if (arg === '-n' || arg === '-o' || arg === '-u') {
      // Critical path: Only load the 'dialog' package if it is needed
--- a/src/main/ipc.js
+++ b/src/main/ipc.js
@@ -120,21 +120,21 @@ function init () {
   */

  ipc.on('startFolderWatcher', function () {
-    if (!modules.folderWatcher) {
+    if (!modules['folderWatcher']) {
      log('IPC ERR: folderWatcher module is not defined.')
      return
    }

-    modules.folderWatcher.start()
+    modules['folderWatcher'].start()
  })

  ipc.on('stopFolderWatcher', function () {
-    if (!modules.folderWatcher) {
+    if (!modules['folderWatcher']) {
      log('IPC ERR: folderWatcher module is not defined.')
      return
    }

-    modules.folderWatcher.stop()
+    modules['folderWatcher'].stop()
  })

  /**
--- a/src/main/menu.js
+++ b/src/main/menu.js
@@ -302,13 +302,6 @@ function getMenuTemplate () {
            shell.openExternal(config.HOME_PAGE_URL)
          }
        },
-        {
-          label: 'Release Notes',
-          click: () => {
-            const shell = require('./shell')
-            shell.openExternal(config.GITHUB_URL_RELEASES)
-          }
-        },
        {
          label: 'Contribute on GitHub',
          click: () => {
@@ -325,13 +318,6 @@ function getMenuTemplate () {
            const shell = require('./shell')
            shell.openExternal(config.GITHUB_URL_ISSUES)
          }
-        },
-        {
-          label: 'Follow us on Twitter',
-          click: () => {
-            const shell = require('./shell')
-            shell.openExternal(config.TWITTER_PAGE_URL)
-          }
        }
      ]
    }
--- a/src/main/startup.js
+++ b/src/main/startup.js
@@ -3,11 +3,19 @@ module.exports = {
  uninstall
 }

-const { APP_NAME } = require('../config')
+const config = require('../config')
 const AutoLaunch = require('auto-launch')
+const { app } = require('electron')
+
+// On Mac, work around a bug in auto-launch where it opens a Terminal window
+// See https://github.com/Teamwork/node-auto-launch/issues/28#issuecomment-222194437
+const appPath = process.platform === 'darwin'
+  ? app.getPath('exe').replace(/\.app\/Content.*/, '.app')
+  : undefined // Use the default

 const appLauncher = new AutoLaunch({
-  name: APP_NAME,
+  name: config.APP_NAME,
+  path: appPath,
  isHidden: true
 })

--- a/src/main/thumbar.js
+++ b/src/main/thumbar.js
@@ -77,8 +77,8 @@ function onPlayerPlay () {

 function onPlayerUpdate (state) {
  if (!isEnabled()) return
-  buttons[PREV].flags = [state.hasPrevious ? 'enabled' : 'disabled']
-  buttons[NEXT].flags = [state.hasNext ? 'enabled' : 'disabled']
+  buttons[PREV].flags = [ state.hasPrevious ? 'enabled' : 'disabled' ]
+  buttons[NEXT].flags = [ state.hasNext ? 'enabled' : 'disabled' ]
  update()
 }

--- a/src/main/windows/about.js
+++ b/src/main/windows/about.js
@@ -24,9 +24,6 @@ function init () {
    skipTaskbar: true,
    title: 'About ' + config.APP_WINDOW_TITLE,
    useContentSize: true,
-    webPreferences: {
-      nodeIntegration: true
-    },
    width: 300
  })

--- a/src/main/windows/main.js
+++ b/src/main/windows/main.js
@@ -40,12 +40,9 @@ function init (state, options) {
    minWidth: config.WINDOW_MIN_WIDTH,
    show: false,
    title: config.APP_WINDOW_TITLE,
-    titleBarStyle: 'hiddenInset', // Hide title bar (Mac)
+    titleBarStyle: 'hidden-inset', // Hide title bar (Mac)
    useContentSize: true, // Specify web page size without OS chrome
    width: initialBounds.width,
-    webPreferences: {
-      nodeIntegration: true
-    },
    x: initialBounds.x,
    y: initialBounds.y
  })
@@ -141,7 +138,7 @@ function setAspectRatio (aspectRatio) {
 function setBounds (bounds, maximize) {
  // Do nothing in fullscreen
  if (!main.win || main.win.isFullScreen()) {
-    log('setBounds: not setting bounds because already in full screen mode')
+    log(`setBounds: not setting bounds because we're in full screen`)
    return
  }

@@ -212,7 +209,7 @@ function toggleDevTools () {
  if (main.win.webContents.isDevToolsOpened()) {
    main.win.webContents.closeDevTools()
  } else {
-    main.win.webContents.openDevTools({ mode: 'detach' })
+    main.win.webContents.openDevTools({ detach: true })
  }
 }

--- a/src/main/windows/webtorrent.js
+++ b/src/main/windows/webtorrent.js
@@ -25,9 +25,6 @@ function init () {
    skipTaskbar: true,
    title: 'webtorrent-hidden-window',
    useContentSize: true,
-    webPreferences: {
-      nodeIntegration: true
-    },
    width: 150
  })

@@ -59,6 +56,6 @@ function toggleDevTools () {
    webtorrent.win.webContents.closeDevTools()
    webtorrent.win.hide()
  } else {
-    webtorrent.win.webContents.openDevTools({ mode: 'detach' })
+    webtorrent.win.webContents.openDevTools({ detach: true })
  }
 }
--- a/src/renderer/components/header.js
+++ b/src/renderer/components/header.js
@@ -6,26 +6,22 @@ class Header extends React.Component {
  render () {
    const loc = this.props.state.location
    return (
-      <div
-        className='header'
+      <div className='header'
        onMouseMove={dispatcher('mediaMouseMoved')}
        onMouseEnter={dispatcher('mediaControlsMouseEnter')}
-        onMouseLeave={dispatcher('mediaControlsMouseLeave')}
-      >
+        onMouseLeave={dispatcher('mediaControlsMouseLeave')}>
        {this.getTitle()}
        <div className='nav left float-left'>
          <i
            className={'icon back ' + (loc.hasBack() ? '' : 'disabled')}
            title='Back'
-            onClick={dispatcher('back')}
-          >
+            onClick={dispatcher('back')}>
            chevron_left
          </i>
          <i
            className={'icon forward ' + (loc.hasForward() ? '' : 'disabled')}
            title='Forward'
-            onClick={dispatcher('forward')}
-          >
+            onClick={dispatcher('forward')}>
            chevron_right
          </i>
        </div>
@@ -49,8 +45,7 @@ class Header extends React.Component {
      <i
        className='icon add'
        title='Add torrent'
-        onClick={dispatcher('openFiles')}
-      >
+        onClick={dispatcher('openFiles')}>
        add
      </i>
    )
--- a/src/renderer/components/heading.js
+++ b/src/renderer/components/heading.js
@@ -1,12 +1,11 @@
 const React = require('react')
-const PropTypes = require('prop-types')

 const colors = require('material-ui/styles/colors')

 class Heading extends React.Component {
  static get propTypes () {
    return {
-      level: PropTypes.number
+      level: React.PropTypes.number
    }
  }

--- a/src/renderer/components/modal-ok-cancel.js
+++ b/src/renderer/components/modal-ok-cancel.js
@@ -12,15 +12,13 @@ module.exports = class ModalOKCancel extends React.Component {
          className='control cancel'
          style={cancelStyle}
          label={cancelText}
-          onClick={onCancel}
-        />
+          onClick={onCancel} />
        <RaisedButton
          className='control ok'
          primary
          label={okText}
          onClick={onOK}
-          autoFocus
-        />
+          autoFocus />
      </div>
    )
  }
--- a/src/renderer/components/open-torrent-address-modal.js
+++ b/src/renderer/components/open-torrent-address-modal.js
@@ -1,10 +1,8 @@
 const React = require('react')
 const TextField = require('material-ui/TextField').default
-const { clipboard } = require('electron')

 const ModalOKCancel = require('./modal-ok-cancel')
 const { dispatch, dispatcher } = require('../lib/dispatcher')
-const { isMagnetLink } = require('../lib/torrent-player')

 module.exports = class OpenTorrentAddressModal extends React.Component {
  render () {
@@ -17,27 +15,19 @@ module.exports = class OpenTorrentAddressModal extends React.Component {
            className='control'
            ref={(c) => { this.torrentURL = c }}
            fullWidth
-            onKeyDown={handleKeyDown.bind(this)}
-          />
+            onKeyDown={handleKeyDown.bind(this)} />
        </div>
        <ModalOKCancel
          cancelText='CANCEL'
          onCancel={dispatcher('exitModal')}
          okText='OK'
-          onOK={handleOK.bind(this)}
-        />
+          onOK={handleOK.bind(this)} />
      </div>
    )
  }

  componentDidMount () {
    this.torrentURL.input.focus()
-    const clipboardContent = clipboard.readText()
-
-    if (isMagnetLink(clipboardContent)) {
-      this.torrentURL.input.value = clipboardContent
-      this.torrentURL.input.select()
-    }
  }
 }

--- a/src/renderer/components/path-selector.js
+++ b/src/renderer/components/path-selector.js
@@ -1,9 +1,6 @@
-const path = require('path')
-
 const colors = require('material-ui/styles/colors')
 const electron = require('electron')
 const React = require('react')
-const PropTypes = require('prop-types')

 const remote = electron.remote

@@ -14,14 +11,15 @@ const TextField = require('material-ui/TextField').default
 // Uses the system Open File dialog.
 // You can't edit the text field directly.
 class PathSelector extends React.Component {
-  static propTypes () {
+  static get propTypes () {
    return {
-      className: PropTypes.string,
-      dialog: PropTypes.object,
-      id: PropTypes.string,
-      onChange: PropTypes.func,
-      title: PropTypes.string.isRequired,
-      value: PropTypes.string
+      className: React.PropTypes.string,
+      dialog: React.PropTypes.object,
+      displayValue: React.PropTypes.string,
+      id: React.PropTypes.string,
+      onChange: React.PropTypes.func,
+      title: React.PropTypes.string.isRequired,
+      value: React.PropTypes.string
    }
  }

@@ -32,8 +30,8 @@ class PathSelector extends React.Component {

  handleClick () {
    const opts = Object.assign({
-      defaultPath: path.dirname(this.props.value || ''),
-      properties: ['openFile', 'openDirectory']
+      defaultPath: this.props.value,
+      properties: [ 'openFile', 'openDirectory' ]
    }, this.props.dialog)

    remote.dialog.showOpenDialog(
@@ -66,7 +64,7 @@ class PathSelector extends React.Component {
    const textFieldStyle = {
      flex: '1'
    }
-    const text = this.props.value || ''
+    const text = this.props.displayValue || this.props.value
    const buttonStyle = {
      marginLeft: 10
    }
@@ -76,14 +74,10 @@ class PathSelector extends React.Component {
        <div className='label' style={labelStyle}>
          {this.props.title}:
        </div>
-        <TextField
-          className='control' disabled id={id} value={text}
-          inputStyle={textareaStyle} style={textFieldStyle}
-        />
-        <RaisedButton
-          className='control' label='Change' onClick={this.handleClick}
-          style={buttonStyle}
-        />
+        <TextField className='control' disabled id={id} value={text}
+          inputStyle={textareaStyle} style={textFieldStyle} />
+        <RaisedButton className='control' label='Change' onClick={this.handleClick}
+          style={buttonStyle} />
      </div>
    )
  }
--- a/src/renderer/components/remove-torrent-modal.js
+++ b/src/renderer/components/remove-torrent-modal.js
@@ -18,8 +18,7 @@ module.exports = class RemoveTorrentModal extends React.Component {
          cancelText='CANCEL'
          onCancel={dispatcher('exitModal')}
          okText={buttonText}
-          onOK={handleRemove}
-        />
+          onOK={handleRemove} />
      </div>
    )

--- a/src/renderer/components/show-more.js
+++ b/src/renderer/components/show-more.js
@@ -1,14 +1,13 @@
 const React = require('react')
-const PropTypes = require('prop-types')

 const RaisedButton = require('material-ui/RaisedButton').default

 class ShowMore extends React.Component {
  static get propTypes () {
    return {
-      defaultExpanded: PropTypes.bool,
-      hideLabel: PropTypes.string,
-      showLabel: PropTypes.string
+      defaultExpanded: React.PropTypes.bool,
+      hideLabel: React.PropTypes.string,
+      showLabel: React.PropTypes.string
    }
  }

@@ -45,8 +44,7 @@ class ShowMore extends React.Component {
        <RaisedButton
          className='control'
          onClick={this.handleClick}
-          label={label}
-        />
+          label={label} />
      </div>
    )
  }
--- a/src/renderer/components/unsupported-media-modal.js
+++ b/src/renderer/components/unsupported-media-modal.js
@@ -28,8 +28,7 @@ module.exports = class UnsupportedMediaModal extends React.Component {
          cancelText='CANCEL'
          onCancel={dispatcher('backToList')}
          okText={actionText}
-          onOK={onAction}
-        />
+          onOK={onAction} />
        <p className='error-text'>{errorMessage}</p>
      </div>
    )
--- a/src/renderer/components/update-available-modal.js
+++ b/src/renderer/components/update-available-modal.js
@@ -18,8 +18,7 @@ module.exports = class UpdateAvailableModal extends React.Component {
          cancelText='SKIP THIS RELEASE'
          onCancel={handleSkip}
          okText='SHOW DOWNLOAD PAGE'
-          onOK={handleShow}
-        />
+          onOK={handleShow} />
      </div>
    )

--- a/src/renderer/controllers/playback-controller.js
+++ b/src/renderer/controllers/playback-controller.js
@@ -269,7 +269,6 @@ module.exports = class PlaybackController {
    // update state
    state.playing.infoHash = infoHash
    state.playing.fileIndex = index
-    state.playing.fileName = fileSummary.name
    state.playing.type = TorrentPlayer.isVideo(fileSummary) ? 'video'
      : TorrentPlayer.isAudio(fileSummary) ? 'audio'
        : 'other'
--- a/src/renderer/controllers/subtitles-controller.js
+++ b/src/renderer/controllers/subtitles-controller.js
@@ -15,8 +15,8 @@ module.exports = class SubtitlesController {
  openSubtitles () {
    remote.dialog.showOpenDialog({
      title: 'Select a subtitles file.',
-      filters: [{ name: 'Subtitles', extensions: ['vtt', 'srt'] }],
-      properties: ['openFile']
+      filters: [ { name: 'Subtitles', extensions: ['vtt', 'srt'] } ],
+      properties: [ 'openFile' ]
    }, (filenames) => {
      if (!Array.isArray(filenames)) return
      this.addSubtitles(filenames, true)
--- a/src/renderer/controllers/torrent-controller.js
+++ b/src/renderer/controllers/torrent-controller.js
@@ -10,7 +10,7 @@ module.exports = class TorrentController {
    this.state = state
  }

-  torrentParsed (torrentKey, infoHash, magnetURI) {
+  torrentInfoHash (torrentKey, infoHash) {
    let torrentSummary = this.getTorrentSummary(torrentKey)
    console.log('got infohash for %s torrent %s',
      torrentSummary ? 'existing' : 'new', torrentKey)
@@ -33,7 +33,6 @@ module.exports = class TorrentController {
    }

    torrentSummary.infoHash = infoHash
-    torrentSummary.magnetURI = magnetURI
    dispatch('update')
  }

@@ -63,6 +62,7 @@ module.exports = class TorrentController {
    torrentSummary.status = 'downloading'
    torrentSummary.name = torrentSummary.displayName || torrentInfo.name
    torrentSummary.path = torrentInfo.path
+    torrentSummary.magnetURI = torrentInfo.magnetURI
    // TODO: make torrentInfo immutable, save separately as torrentSummary.info
    // For now, check whether torrentSummary.files has already been set:
    const hasDetailedFileInfo = torrentSummary.files && torrentSummary.files[0].path
--- a/src/renderer/controllers/torrent-list-controller.js
+++ b/src/renderer/controllers/torrent-list-controller.js
@@ -318,7 +318,7 @@ module.exports = class TorrentListController {
 function findFilesRecursive (paths, cb_) {
  if (paths.length > 1) {
    let numComplete = 0
-    const ret = []
+    let ret = []
    paths.forEach(function (path) {
      findFilesRecursive([path], function (fileObjs) {
        ret.push(...fileObjs)
--- a/src/renderer/lib/media-extensions.js
+++ b/src/renderer/lib/media-extensions.js
@@ -1,10 +1,9 @@
 const mediaExtensions = {
  audio: [
-    '.aac', '.aif', '.aiff', '.asf', '.dff', '.dsf', '.flac', '.m2a',
-    '.m4a', '.m4b', '.mp2', '.mp3', '.mpc', '.oga', '.ogg', '.opus',
-    '.spx', '.wma', '.wav', '.wv', '.wvp'],
+    '.aac', '.asf', '.flac', '.m2a', '.m4a', '.m4b', '.mp2', '.mp4',
+    '.mp3', '.oga', '.ogg', '.opus', '.wma', '.wav', '.wv', '.wvp'],
  video: [
-    '.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', '.mpg', '.mpeg',
+    '.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', 'mpg', 'mpeg',
    '.ogv', '.webm', '.wmv'],
  image: ['.gif', '.jpg', '.jpeg', '.png']
 }
--- a/src/renderer/lib/migrations.js
+++ b/src/renderer/lib/migrations.js
@@ -28,15 +28,13 @@ function run (state) {
  if (semver.lt(version, '0.14.0')) migrate_0_14_0(saved)
  if (semver.lt(version, '0.17.0')) migrate_0_17_0(saved)
  if (semver.lt(version, '0.17.2')) migrate_0_17_2(saved)
-  if (semver.lt(version, '0.21.0')) migrate_0_21_0(saved)
-  if (semver.lt(version, '0.21.1')) migrate_0_21_1(saved)

  // Config is now on the new version
  state.saved.version = config.APP_VERSION
 }

 function migrate_0_7_0 (saved) {
-  const { copyFileSync } = require('fs')
+  const cpFile = require('cp-file')
  const path = require('path')

  saved.torrents.forEach(function (ts) {
@@ -58,7 +56,7 @@ function migrate_0_7_0 (saved) {
      dst = path.join(config.TORRENT_PATH, infoHash + '.torrent')
      // Synchronous FS calls aren't ideal, but probably OK in a migration
      // that only runs once
-      if (src !== dst) copyFileSync(src, dst)
+      if (src !== dst) cpFile.sync(src, dst)

      delete ts.torrentPath
      ts.torrentFileName = infoHash + '.torrent'
@@ -73,7 +71,7 @@ function migrate_0_7_0 (saved) {
      dst = path.join(config.POSTER_PATH, infoHash + extension)
      // Synchronous FS calls aren't ideal, but probably OK in a migration
      // that only runs once
-      if (src !== dst) copyFileSync(src, dst)
+      if (src !== dst) cpFile.sync(src, dst)

      delete ts.posterURL
      ts.posterFileName = infoHash + extension
@@ -157,7 +155,7 @@ function migrate_0_17_2 (saved) {
  // folders/files that end in a trailing dot (.) or space are not deletable from
  // Windows Explorer. See: https://github.com/webtorrent/webtorrent-desktop/issues/905

-  const { copyFileSync } = require('fs')
+  const cpFile = require('cp-file')
  const rimraf = require('rimraf')

  const OLD_NAME = 'The WIRED CD - Rip. Sample. Mash. Share.'
@@ -192,7 +190,7 @@ function migrate_0_17_2 (saved) {
  ts.posterFileName = NEW_HASH + '.jpg'

  rimraf.sync(path.join(config.TORRENT_PATH, ts.torrentFileName))
-  copyFileSync(
+  cpFile.sync(
    path.join(config.STATIC_PATH, 'wiredCd.torrent'),
    path.join(config.TORRENT_PATH, NEW_HASH + '.torrent')
  )
@@ -208,16 +206,3 @@ function migrate_0_17_2 (saved) {
    } catch (err) {}
  }
 }
-
-function migrate_0_21_0 (saved) {
-  if (saved.prefs.soundNotifications == null) {
-    // The app used to always have sound notifications enabled
-    saved.prefs.soundNotifications = true
-  }
-}
-
-function migrate_0_21_1 (saved) {
-  if (saved.prefs.externalPlayerPath == null) {
-    saved.prefs.externalPlayerPath = ''
-  }
-}
--- a/src/renderer/lib/playlist.js
+++ b/src/renderer/lib/playlist.js
@@ -38,8 +38,7 @@ function getPreviousIndex (state) {

 function getCurrentLocalURL (state) {
  return state.server
-    ? state.server.localURL + '/' + state.playing.fileIndex + '/' +
-      encodeURIComponent(state.playing.fileName)
+    ? state.server.localURL + '/' + state.playing.fileIndex
    : ''
 }

--- a/src/renderer/lib/sound.js
+++ b/src/renderer/lib/sound.js
@@ -1,5 +1,4 @@
 module.exports = {
-  init,
  play
 }

@@ -9,9 +8,6 @@ const path = require('path')

 const VOLUME = 0.25

-// App state to access the soundNotifications preference
-let state
-
 /* Cache of Audio elements, for instant playback */
 const cache = {}

@@ -50,19 +46,7 @@ const sounds = {
  }
 }

-function init (appState) {
-  state = appState
-}
-
 function play (name) {
-  if (state == null) {
-    return
-  }
-
-  if (!state.saved.prefs.soundNotifications) {
-    return
-  }
-
  let audio = cache[name]
  if (!audio) {
    const sound = sounds[name]
--- a/src/renderer/lib/state.js
+++ b/src/renderer/lib/state.js
@@ -88,7 +88,6 @@ function getDefaultPlayState () {
  return {
    infoHash: null, /* the info hash of the torrent we're playing */
    fileIndex: null, /* the zero-based index within the torrent */
-    fileName: null, /* name of the file that is playing */
    location: 'local', /* 'local', 'chromecast', 'airplay' */
    type: null, /* 'audio' or 'video', could be 'other' if ever support eg streaming to VLC */
    currentTime: 0, /* seconds */
@@ -110,8 +109,9 @@ function getDefaultPlayState () {
 }

 /* If the saved state file doesn't exist yet, here's what we use instead */
-function setupStateSaved () {
-  const { copyFileSync, mkdirSync, readFileSync } = require('fs')
+function setupStateSaved (cb) {
+  const cpFile = require('cp-file')
+  const fs = require('fs')
  const parseTorrent = require('parse-torrent')

  const saved = {
@@ -119,9 +119,8 @@ function setupStateSaved () {
      downloadPath: config.DEFAULT_DOWNLOAD_PATH,
      isFileHandler: false,
      openExternalPlayer: false,
-      externalPlayerPath: '',
+      externalPlayerPath: null,
      startup: false,
-      soundNotifications: true,
      autoAddTorrents: false,
      torrentsFolderPath: '',
      highestPlaybackPriority: true
@@ -131,28 +130,31 @@ function setupStateSaved () {
    version: config.APP_VERSION /* make sure we can upgrade gracefully later */
  }

-  // TODO: Doing several sync calls during first startup is not ideal
-  mkdirSync(config.POSTER_PATH, { recursive: true })
-  mkdirSync(config.TORRENT_PATH, { recursive: true })
+  const tasks = []

  config.DEFAULT_TORRENTS.forEach((t, i) => {
    const infoHash = saved.torrents[i].infoHash
-    // TODO: Doing several sync calls during first startup is not ideal
-    copyFileSync(
-      path.join(config.STATIC_PATH, t.posterFileName),
-      path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
+    tasks.push(
+      cpFile(
+        path.join(config.STATIC_PATH, t.posterFileName),
+        path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
+      )
    )
-    copyFileSync(
-      path.join(config.STATIC_PATH, t.torrentFileName),
-      path.join(config.TORRENT_PATH, infoHash + '.torrent')
+    tasks.push(
+      cpFile(
+        path.join(config.STATIC_PATH, t.torrentFileName),
+        path.join(config.TORRENT_PATH, infoHash + '.torrent')
+      )
    )
  })

-  return saved
+  Promise.all(tasks)
+    .then(() => cb(null, saved))
+    .catch(err => cb(err))

  function createTorrentObject (t) {
-    // TODO: Doing several sync calls during first startup is not ideal
-    const torrent = readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
+    // TODO: Doing several fs.readFileSync calls during first startup is not ideal
+    const torrent = fs.readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
    const parsedTorrent = parseTorrent(torrent)

    return {
@@ -201,14 +203,10 @@ function load (cb) {
  appConfig.read(function (err, saved) {
    if (err || !saved.version) {
      console.log('Missing config file: Creating new one')
-      try {
-        saved = setupStateSaved()
-      } catch (err) {
-        onSavedState(err)
-        return
-      }
+      setupStateSaved(onSavedState)
+    } else {
+      onSavedState(null, saved)
    }
-    onSavedState(null, saved)
  })

  function onSavedState (err, saved) {
@@ -238,7 +236,7 @@ function saveImmediate (state, cb) {
    .filter((x) => x.infoHash)
    .map(function (x) {
      const torrent = {}
-      for (const key in x) {
+      for (let key in x) {
        if (key === 'progress' || key === 'torrentKey') {
          continue // Don't save progress info or key for the webtorrent process
        }
--- a/src/renderer/lib/telemetry.js
+++ b/src/renderer/lib/telemetry.js
@@ -74,7 +74,7 @@ function reset () {

 // Track screen resolution
 function getScreenInfo () {
-  return electron.remote.screen.getAllDisplays().map((screen) => ({
+  return electron.screen.getAllDisplays().map((screen) => ({
    width: screen.size.width,
    height: screen.size.height,
    scaleFactor: screen.scaleFactor
@@ -98,7 +98,7 @@ function getSystemInfo () {
 function getTorrentStats (state) {
  const count = state.saved.torrents.length
  let sizeMB = 0
-  const byStatus = {
+  let byStatus = {
    new: { count: 0, sizeMB: 0 },
    downloading: { count: 0, sizeMB: 0 },
    seeding: { count: 0, sizeMB: 0 },
--- a/src/renderer/lib/torrent-player.js
+++ b/src/renderer/lib/torrent-player.js
@@ -3,7 +3,6 @@ module.exports = {
  isVideo,
  isAudio,
  isTorrent,
-  isMagnetLink,
  isPlayableTorrentSummary
 }

@@ -32,15 +31,9 @@ function isAudio (file) {
 // - a file object where obj.name is ends in .torrent
 // - a string that's a magnet link (magnet://...)
 function isTorrent (file) {
-  return isTorrentFile(file) || isMagnetLink(file)
-}
-
-function isTorrentFile (file) {
-  return getFileExtension(file) === '.torrent'
-}
-
-function isMagnetLink (link) {
-  return typeof link === 'string' && /^(stream-)?magnet:/.test(link)
+  const isTorrentFile = getFileExtension(file) === '.torrent'
+  const isMagnet = typeof file === 'string' && /^(stream-)?magnet:/.test(file)
+  return isTorrentFile || isMagnet
 }

 function getFileExtension (file) {
--- a/src/renderer/lib/torrent-poster.js
+++ b/src/renderer/lib/torrent-poster.js
@@ -18,8 +18,7 @@ function torrentPoster (torrent, cb) {
  const bestScore = ['audio', 'video', 'image'].map(mediaType => {
    return {
      type: mediaType,
-      size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType])
-    }
+      size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType]) }
  }).sort((a, b) => { // sort descending on size
    return b.size - a.size
  })[0]
@@ -99,7 +98,7 @@ function scoreAudioCoverFile (imgFile) {
    spectrogram: -80
  }

-  for (const keyword in relevanceScore) {
+  for (let keyword in relevanceScore) {
    if (fileName === keyword) {
      return relevanceScore[keyword]
    }
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -5,7 +5,7 @@
 *   actually used because auto-prefixing is disabled with
 *   `darkBaseTheme.userAgent = false`. Return a fake object.
 */
-const Module = require('module')
+let Module = require('module')
 const _require = Module.prototype.require
 Module.prototype.require = function (id) {
  if (id === 'inline-style-prefixer') return {}
@@ -39,6 +39,9 @@ const TorrentPlayer = require('./lib/torrent-player')
 // Perf optimization: Needed immediately, so do not lazy load it below
 const TorrentListController = require('./controllers/torrent-list-controller')

+// Required by Material UI -- adds `onTouchTap` event
+require('react-tap-event-plugin')()
+
 const App = require('./pages/app')

 // Electron apps have two processes: a main process (node) runs first and starts
@@ -74,7 +77,6 @@ function onState (err, _state) {
  window.dispatch = dispatch

  telemetry.init(state)
-  sound.init(state)

  // Log uncaught JS errors
  window.addEventListener(
@@ -148,9 +150,6 @@ function onState (err, _state) {
  // ...same thing if you paste a torrent
  document.addEventListener('paste', onPaste)

-  // Add YouTube style hotkey shortcuts
-  window.addEventListener('keydown', onKeydown)
-
  const debouncedFullscreenToggle = debounce(function () {
    dispatch('toggleFullScreen')
  }, 1000, true)
@@ -235,100 +234,100 @@ function updateElectron () {

 const dispatchHandlers = {
  // Torrent list: creating, deleting, selecting torrents
-  openTorrentFile: () => ipcRenderer.send('openTorrentFile'),
-  openFiles: () => ipcRenderer.send('openFiles'), /* shows the open file dialog */
-  openTorrentAddress: () => { state.modal = { id: 'open-torrent-address-modal' } },
+  'openTorrentFile': () => ipcRenderer.send('openTorrentFile'),
+  'openFiles': () => ipcRenderer.send('openFiles'), /* shows the open file dialog */
+  'openTorrentAddress': () => { state.modal = { id: 'open-torrent-address-modal' } },

-  addTorrent: (torrentId) => controllers.torrentList().addTorrent(torrentId),
-  showCreateTorrent: (paths) => controllers.torrentList().showCreateTorrent(paths),
-  createTorrent: (options) => controllers.torrentList().createTorrent(options),
-  toggleTorrent: (infoHash) => controllers.torrentList().toggleTorrent(infoHash),
-  pauseAllTorrents: () => controllers.torrentList().pauseAllTorrents(),
-  resumeAllTorrents: () => controllers.torrentList().resumeAllTorrents(),
-  toggleTorrentFile: (infoHash, index) =>
+  'addTorrent': (torrentId) => controllers.torrentList().addTorrent(torrentId),
+  'showCreateTorrent': (paths) => controllers.torrentList().showCreateTorrent(paths),
+  'createTorrent': (options) => controllers.torrentList().createTorrent(options),
+  'toggleTorrent': (infoHash) => controllers.torrentList().toggleTorrent(infoHash),
+  'pauseAllTorrents': () => controllers.torrentList().pauseAllTorrents(),
+  'resumeAllTorrents': () => controllers.torrentList().resumeAllTorrents(),
+  'toggleTorrentFile': (infoHash, index) =>
    controllers.torrentList().toggleTorrentFile(infoHash, index),
-  confirmDeleteTorrent: (infoHash, deleteData) =>
+  'confirmDeleteTorrent': (infoHash, deleteData) =>
    controllers.torrentList().confirmDeleteTorrent(infoHash, deleteData),
-  deleteTorrent: (infoHash, deleteData) =>
+  'deleteTorrent': (infoHash, deleteData) =>
    controllers.torrentList().deleteTorrent(infoHash, deleteData),
-  toggleSelectTorrent: (infoHash) =>
+  'toggleSelectTorrent': (infoHash) =>
    controllers.torrentList().toggleSelectTorrent(infoHash),
-  openTorrentContextMenu: (infoHash) =>
+  'openTorrentContextMenu': (infoHash) =>
    controllers.torrentList().openTorrentContextMenu(infoHash),
-  startTorrentingSummary: (torrentKey) =>
+  'startTorrentingSummary': (torrentKey) =>
    controllers.torrentList().startTorrentingSummary(torrentKey),
-  saveTorrentFileAs: (torrentKey) =>
+  'saveTorrentFileAs': (torrentKey) =>
    controllers.torrentList().saveTorrentFileAs(torrentKey),
-  prioritizeTorrent: (infoHash) => controllers.torrentList().prioritizeTorrent(infoHash),
-  resumePausedTorrents: () => controllers.torrentList().resumePausedTorrents(),
+  'prioritizeTorrent': (infoHash) => controllers.torrentList().prioritizeTorrent(infoHash),
+  'resumePausedTorrents': () => controllers.torrentList().resumePausedTorrents(),

  // Playback
-  playFile: (infoHash, index) => controllers.playback().playFile(infoHash, index),
-  playPause: () => controllers.playback().playPause(),
-  nextTrack: () => controllers.playback().nextTrack(),
-  previousTrack: () => controllers.playback().previousTrack(),
-  skip: (time) => controllers.playback().skip(time),
-  skipTo: (time) => controllers.playback().skipTo(time),
-  changePlaybackRate: (dir) => controllers.playback().changePlaybackRate(dir),
-  changeVolume: (delta) => controllers.playback().changeVolume(delta),
-  setVolume: (vol) => controllers.playback().setVolume(vol),
-  openItem: (infoHash, index) => controllers.playback().openItem(infoHash, index),
+  'playFile': (infoHash, index) => controllers.playback().playFile(infoHash, index),
+  'playPause': () => controllers.playback().playPause(),
+  'nextTrack': () => controllers.playback().nextTrack(),
+  'previousTrack': () => controllers.playback().previousTrack(),
+  'skip': (time) => controllers.playback().skip(time),
+  'skipTo': (time) => controllers.playback().skipTo(time),
+  'changePlaybackRate': (dir) => controllers.playback().changePlaybackRate(dir),
+  'changeVolume': (delta) => controllers.playback().changeVolume(delta),
+  'setVolume': (vol) => controllers.playback().setVolume(vol),
+  'openItem': (infoHash, index) => controllers.playback().openItem(infoHash, index),

  // Subtitles
-  openSubtitles: () => controllers.subtitles().openSubtitles(),
-  selectSubtitle: (index) => controllers.subtitles().selectSubtitle(index),
-  toggleSubtitlesMenu: () => controllers.subtitles().toggleSubtitlesMenu(),
-  checkForSubtitles: () => controllers.subtitles().checkForSubtitles(),
-  addSubtitles: (files, autoSelect) => controllers.subtitles().addSubtitles(files, autoSelect),
+  'openSubtitles': () => controllers.subtitles().openSubtitles(),
+  'selectSubtitle': (index) => controllers.subtitles().selectSubtitle(index),
+  'toggleSubtitlesMenu': () => controllers.subtitles().toggleSubtitlesMenu(),
+  'checkForSubtitles': () => controllers.subtitles().checkForSubtitles(),
+  'addSubtitles': (files, autoSelect) => controllers.subtitles().addSubtitles(files, autoSelect),

  // Local media: <video>, <audio>, external players
-  mediaStalled: () => controllers.media().mediaStalled(),
-  mediaError: (err) => controllers.media().mediaError(err),
-  mediaSuccess: () => controllers.media().mediaSuccess(),
-  mediaTimeUpdate: () => controllers.media().mediaTimeUpdate(),
-  mediaMouseMoved: () => controllers.media().mediaMouseMoved(),
-  mediaControlsMouseEnter: () => controllers.media().controlsMouseEnter(),
-  mediaControlsMouseLeave: () => controllers.media().controlsMouseLeave(),
-  openExternalPlayer: () => controllers.media().openExternalPlayer(),
-  externalPlayerNotFound: () => controllers.media().externalPlayerNotFound(),
+  'mediaStalled': () => controllers.media().mediaStalled(),
+  'mediaError': (err) => controllers.media().mediaError(err),
+  'mediaSuccess': () => controllers.media().mediaSuccess(),
+  'mediaTimeUpdate': () => controllers.media().mediaTimeUpdate(),
+  'mediaMouseMoved': () => controllers.media().mediaMouseMoved(),
+  'mediaControlsMouseEnter': () => controllers.media().controlsMouseEnter(),
+  'mediaControlsMouseLeave': () => controllers.media().controlsMouseLeave(),
+  'openExternalPlayer': () => controllers.media().openExternalPlayer(),
+  'externalPlayerNotFound': () => controllers.media().externalPlayerNotFound(),

  // Remote casting: Chromecast, Airplay, etc
-  toggleCastMenu: (deviceType) => lazyLoadCast().toggleMenu(deviceType),
-  selectCastDevice: (index) => lazyLoadCast().selectDevice(index),
-  stopCasting: () => lazyLoadCast().stop(),
+  'toggleCastMenu': (deviceType) => lazyLoadCast().toggleMenu(deviceType),
+  'selectCastDevice': (index) => lazyLoadCast().selectDevice(index),
+  'stopCasting': () => lazyLoadCast().stop(),

  // Preferences screen
-  preferences: () => controllers.prefs().show(),
-  updatePreferences: (key, value) => controllers.prefs().update(key, value),
-  checkDownloadPath: checkDownloadPath,
-  startFolderWatcher: () => controllers.folderWatcher().start(),
-  stopFolderWatcher: () => controllers.folderWatcher().stop(),
+  'preferences': () => controllers.prefs().show(),
+  'updatePreferences': (key, value) => controllers.prefs().update(key, value),
+  'checkDownloadPath': checkDownloadPath,
+  'startFolderWatcher': () => controllers.folderWatcher().start(),
+  'stopFolderWatcher': () => controllers.folderWatcher().stop(),

  // Update (check for new versions on Linux, where there's no auto updater)
-  updateAvailable: (version) => controllers.update().updateAvailable(version),
-  skipVersion: (version) => controllers.update().skipVersion(version),
+  'updateAvailable': (version) => controllers.update().updateAvailable(version),
+  'skipVersion': (version) => controllers.update().skipVersion(version),

  // Navigation between screens (back, forward, ESC, etc)
-  exitModal: () => { state.modal = null },
-  backToList: backToList,
-  escapeBack: escapeBack,
-  back: () => state.location.back(),
-  forward: () => state.location.forward(),
-  cancel: () => state.location.cancel(),
+  'exitModal': () => { state.modal = null },
+  'backToList': backToList,
+  'escapeBack': escapeBack,
+  'back': () => state.location.back(),
+  'forward': () => state.location.forward(),
+  'cancel': () => state.location.cancel(),

  // Controlling the window
-  setDimensions: setDimensions,
-  toggleFullScreen: (setTo) => ipcRenderer.send('toggleFullScreen', setTo),
-  setTitle: (title) => { state.window.title = title },
-  resetTitle: () => { state.window.title = config.APP_WINDOW_TITLE },
+  'setDimensions': setDimensions,
+  'toggleFullScreen': (setTo) => ipcRenderer.send('toggleFullScreen', setTo),
+  'setTitle': (title) => { state.window.title = title },
+  'resetTitle': () => { state.window.title = config.APP_WINDOW_TITLE },

  // Everything else
-  onOpen: onOpen,
-  error: onError,
-  uncaughtError: (proc, err) => telemetry.logUncaughtError(proc, err),
-  stateSave: () => State.save(state),
-  stateSaveImmediate: () => State.saveImmediate(state),
-  update: () => {} // No-op, just trigger an update
+  'onOpen': onOpen,
+  'error': onError,
+  'uncaughtError': (proc, err) => telemetry.logUncaughtError(proc, err),
+  'stateSave': () => State.save(state),
+  'stateSaveImmediate': () => State.saveImmediate(state),
+  'update': () => {} // No-op, just trigger an update
 }

 // Events from the UI never modify state directly. Instead they call dispatch()
@@ -360,7 +359,7 @@ function setupIpc () {
  ipcRenderer.on('windowBoundsChanged', onWindowBoundsChanged)

  const tc = controllers.torrent()
-  ipcRenderer.on('wt-parsed', (e, ...args) => tc.torrentParsed(...args))
+  ipcRenderer.on('wt-infohash', (e, ...args) => tc.torrentInfoHash(...args))
  ipcRenderer.on('wt-metadata', (e, ...args) => tc.torrentMetadata(...args))
  ipcRenderer.on('wt-done', (e, ...args) => tc.torrentDone(...args))
  ipcRenderer.on('wt-done', () => controllers.torrentList().resumePausedTorrents())
@@ -458,7 +457,7 @@ function setDimensions (dimensions) {
 // Called when the user adds files (.torrent, files to seed, subtitles) to the app
 // via any method (drag-drop, drag to app icon, command line)
 function onOpen (files) {
-  if (!Array.isArray(files)) files = [files]
+  if (!Array.isArray(files)) files = [ files ]

  // File API seems to transform "magnet:?foo" in "magnet:///?foo"
  // this is a sanitization
@@ -511,34 +510,6 @@ function onPaste (e) {
  update()
 }

-function onKeydown (e) {
-  const key = e.key
-
-  if (key === 'ArrowLeft') {
-    dispatch('skip', -5)
-  } else if (key === 'ArrowRight') {
-    dispatch('skip', 5)
-  } else if (key === 'ArrowUp') {
-    dispatch('changeVolume', 0.1)
-  } else if (key === 'ArrowDown') {
-    dispatch('changeVolume', -0.1)
-  } else if (key === 'j') {
-    dispatch('skip', -10)
-  } else if (key === 'l') {
-    dispatch('skip', 10)
-  } else if (key === 'k') {
-    dispatch('playPause')
-  } else if (key === '>') {
-    dispatch('changePlaybackRate', 1)
-  } else if (key === '<') {
-    dispatch('changePlaybackRate', -1)
-  } else if (key === 'f') {
-    dispatch('toggleFullScreen')
-  }
-
-  update()
-}
-
 function onFocus (e) {
  state.window.isFocused = true
  state.dock.badge = 0
--- a/src/renderer/pages/app.js
+++ b/src/renderer/pages/app.js
@@ -12,10 +12,10 @@ const Header = require('../components/header')
 const TorrentListPage = require('./torrent-list-page')

 const Views = {
-  home: createGetter(() => TorrentListPage),
-  player: createGetter(() => require('./player-page')),
+  'home': createGetter(() => TorrentListPage),
+  'player': createGetter(() => require('./player-page')),
  'create-torrent': createGetter(() => require('./create-torrent-page')),
-  preferences: createGetter(() => require('./preferences-page'))
+  'preferences': createGetter(() => require('./preferences-page'))
 }

 const Modals = {
@@ -88,10 +88,8 @@ class App extends React.Component {
      return (<div key={i} className='error'>{error.message}</div>)
    })
    return (
-      <div
-        key='errors'
-        className={'error-popover ' + (hasErrors ? 'visible' : 'hidden')}
-      >
+      <div key='errors'
+        className={'error-popover ' + (hasErrors ? 'visible' : 'hidden')}>
        <div key='title' className='title'>Error</div>
        {errorElems}
      </div>
--- a/src/renderer/pages/create-torrent-page.js
+++ b/src/renderer/pages/create-torrent-page.js
@@ -65,9 +65,9 @@ class CreateTorrentPage extends React.Component {
    }

    // Create React event handlers only once
-    this.handleSetIsPrivate = (_, isPrivate) => this.setState({ isPrivate })
-    this.handleSetComment = (_, comment) => this.setState({ comment })
-    this.handleSetTrackers = (_, trackers) => this.setState({ trackers })
+    this.setIsPrivate = (_, isPrivate) => this.setState({ isPrivate })
+    this.setComment = (_, comment) => this.setState({ comment })
+    this.setTrackers = (_, trackers) => this.setState({ trackers })
    this.handleSubmit = handleSubmit.bind(this)
  }

@@ -94,8 +94,7 @@ class CreateTorrentPage extends React.Component {
            marginBottom: 10
          }}
          hideLabel='Hide advanced settings...'
-          showLabel='Show advanced settings...'
-        >
+          showLabel='Show advanced settings...'>
          {this.renderAdvanced()}
        </ShowMore>
        <div className='float-right'>
@@ -105,14 +104,12 @@ class CreateTorrentPage extends React.Component {
            style={{
              marginRight: 10
            }}
-            onClick={dispatcher('cancel')}
-          />
+            onClick={dispatcher('cancel')} />
          <RaisedButton
            className='control create-torrent-button'
            label='Create Torrent'
            primary
-            onClick={this.handleSubmit}
-          />
+            onClick={this.handleSubmit} />
        </div>
      </div>
    )
@@ -146,8 +143,7 @@ class CreateTorrentPage extends React.Component {
            className='torrent-is-private control'
            style={{ display: '' }}
            checked={this.state.isPrivate}
-            onCheck={this.handleSetIsPrivate}
-          />
+            onCheck={this.setIsPrivate} />
        </div>
        <div key='trackers' className='torrent-attribute'>
          <label>Trackers:</label>
@@ -159,8 +155,7 @@ class CreateTorrentPage extends React.Component {
            rows={2}
            rowsMax={10}
            value={this.state.trackers}
-            onChange={this.handleSetTrackers}
-          />
+            onChange={this.setTrackers} />
        </div>
        <div key='comment' className='torrent-attribute'>
          <label>Comment:</label>
@@ -173,8 +168,7 @@ class CreateTorrentPage extends React.Component {
            rows={2}
            rowsMax={10}
            value={this.state.comment}
-            onChange={this.handleSetComment}
-          />
+            onChange={this.setComment} />
        </div>
        <div key='files' className='torrent-attribute'>
          <label>Files:</label>
--- a/src/renderer/pages/player-page.js
+++ b/src/renderer/pages/player-page.js
@@ -1,6 +1,7 @@
 const React = require('react')
 const Bitfield = require('bitfield')
 const prettyBytes = require('prettier-bytes')
+const zeroFill = require('zero-fill')

 const TorrentSummary = require('../lib/torrent-summary')
 const Playlist = require('../lib/playlist')
@@ -19,8 +20,7 @@ module.exports = class Player extends React.Component {
      <div
        className='player'
        onWheel={handleVolumeWheel}
-        onMouseMove={dispatcher('mediaMouseMoved')}
-      >
+        onMouseMove={dispatcher('mediaMouseMoved')}>
        {showVideo ? renderMedia(state) : renderCastScreen(state)}
        {showControls ? renderPlayerControls(state) : null}
      </div>
@@ -54,10 +54,6 @@ function renderMedia (state) {
      mediaElement.pause()
    } else if (!state.playing.isPaused && mediaElement.paused) {
      mediaElement.play()
-        .then(
-          () => dispatch('mediaSuccess'),
-          err => dispatch('mediaError', err.name === 'NotSupportedError' ? 'Codec unsupported' : `${err.name}: ${err.message}`)
-        )
    }
    // When the user clicks or drags on the progress bar, jump to that position
    if (state.playing.jumpToTime != null) {
@@ -114,8 +110,7 @@ function renderMedia (state) {
          default={isSelected ? 'default' : ''}
          label={track.label}
          type='subtitles'
-          src={track.buffer}
-        />
+          src={track.buffer} />
      )
    }
  }
@@ -129,9 +124,10 @@ function renderMedia (state) {
      onLoadedMetadata={onLoadedMetadata}
      onEnded={onEnded}
      onStalled={dispatcher('mediaStalled')}
+      onError={dispatcher('mediaError')}
      onTimeUpdate={dispatcher('mediaTimeUpdate')}
      onEncrypted={dispatcher('mediaEncrypted')}
-    >
+      onCanPlay={onCanPlay}>
      {trackTags}
    </MediaTagName>
  )
@@ -141,8 +137,7 @@ function renderMedia (state) {
    <div
      key='letterbox'
      className='letterbox'
-      onMouseMove={dispatcher('mediaMouseMoved')}
-    >
+      onMouseMove={dispatcher('mediaMouseMoved')}>
      {mediaTag}
      {renderOverlay(state)}
    </div>
@@ -168,6 +163,19 @@ function renderMedia (state) {
      if (state.window.isFullScreen) dispatch('toggleFullScreen')
    }
  }
+
+  function onCanPlay (e) {
+    const elem = e.target
+    if (state.playing.type === 'video' &&
+      elem.webkitVideoDecodedByteCount === 0) {
+      dispatch('mediaError', 'Video codec unsupported')
+    } else if (elem.webkitAudioDecodedByteCount === 0) {
+      dispatch('mediaError', 'Audio codec unsupported')
+    } else {
+      dispatch('mediaSuccess')
+      elem.play()
+    }
+  }
 }

 function renderOverlay (state) {
@@ -285,7 +293,7 @@ function renderAudioMetadata (state) {
    }
    elems.push((
      <div key='release' className='audio-release'>
-        <label>Release</label>{releaseInfo.join(', ')}
+        <label>Release</label>{ releaseInfo.join(', ') }
      </div>
    ))
  }
@@ -293,18 +301,14 @@ function renderAudioMetadata (state) {
  // Audio metadata: format
  const format = []
  fileSummary.audioInfo.format = fileSummary.audioInfo.format || ''
-  if (fileSummary.audioInfo.format.container) {
-    format.push(fileSummary.audioInfo.format.container)
-  }
-  if (fileSummary.audioInfo.format.codec &&
-    fileSummary.audioInfo.format.container !== fileSummary.audioInfo.format.codec) {
-    format.push(fileSummary.audioInfo.format.codec)
+  if (fileSummary.audioInfo.format.dataformat) {
+    format.push(fileSummary.audioInfo.format.dataformat)
  }
  if (fileSummary.audioInfo.format.bitrate) {
    format.push(Math.round(fileSummary.audioInfo.format.bitrate / 1000) + ' kbps') // 128 kbps
  }
  if (fileSummary.audioInfo.format.sampleRate) {
-    format.push(Math.round(fileSummary.audioInfo.format.sampleRate / 100) / 10 + ' kHz')
+    format.push(Math.round(fileSummary.audioInfo.format.sampleRate / 100) / 10 + ' kHz') // 44.1 kHz
  }
  if (fileSummary.audioInfo.format.bitsPerSample) {
    format.push(fileSummary.audioInfo.format.bitsPerSample + ' bit')
@@ -312,7 +316,7 @@ function renderAudioMetadata (state) {
  if (format.length > 0) {
    elems.push((
      <div key='format' className='audio-format'>
-        <label>Format</label>{format.join(', ')}
+        <label>Format</label>{ format.join(', ') }
      </div>
    ))
  }
@@ -354,7 +358,7 @@ function renderLoadingSpinner (state) {
    <div key='loading' className='media-stalled'>
      <div key='loading-spinner' className='loading-spinner' />
      <div key='loading-progress' className='loading-status ellipsis'>
-        <span><span className='progress'>{fileProgress}%</span> downloaded</span>
+        <span className='progress'>{fileProgress}%</span> downloaded
        <span> ↓ {prettyBytes(prog.downloadSpeed || 0)}/s</span>
        <span> ↑ {prettyBytes(prog.uploadSpeed || 0)}/s</span>
      </div>
@@ -421,7 +425,6 @@ function renderCastOptions (state) {
    return (
      <li key={ix} onClick={dispatcher('selectCastDevice', ix)}>
        <i className='icon'>{isSelected ? 'radio_button_checked' : 'radio_button_unchecked'}</i>
-        {' '}
        {name}
      </li>
    )
@@ -478,47 +481,41 @@ function renderPlayerControls (state) {
      <div
        key='cursor'
        className='playback-cursor'
-        style={playbackCursorStyle}
-      />
+        style={playbackCursorStyle} />
      <div
        key='scrub-bar'
        className='scrub-bar'
        draggable='true'
        onDragStart={handleDragStart}
        onClick={handleScrub}
-        onDrag={handleScrub}
-      />
+        onDrag={handleScrub} />
    </div>,

    <i
      key='skip-previous'
      className={'icon skip-previous float-left ' + prevClass}
-      onClick={dispatcher('previousTrack')}
-    >
+      onClick={dispatcher('previousTrack')}>
      skip_previous
    </i>,

    <i
      key='play'
      className='icon play-pause float-left'
-      onClick={dispatcher('playPause')}
-    >
+      onClick={dispatcher('playPause')}>
      {state.playing.isPaused ? 'play_arrow' : 'pause'}
    </i>,

    <i
      key='skip-next'
      className={'icon skip-next float-left ' + nextClass}
-      onClick={dispatcher('nextTrack')}
-    >
+      onClick={dispatcher('nextTrack')}>
      skip_next
    </i>,

    <i
      key='fullscreen'
      className='icon fullscreen float-right'
-      onClick={dispatcher('toggleFullScreen')}
-    >
+      onClick={dispatcher('toggleFullScreen')}>
      {state.window.isFullScreen ? 'fullscreen_exit' : 'fullscreen'}
    </i>
  ]
@@ -529,8 +526,7 @@ function renderPlayerControls (state) {
      <i
        key='subtitles'
        className={'icon closed-caption float-right ' + captionsClass}
-        onClick={handleSubtitles}
-      >
+        onClick={handleSubtitles}>
        closed_caption
      </i>
    ))
@@ -543,9 +539,9 @@ function renderPlayerControls (state) {

  // Add the cast buttons. Icons for each cast type, connected/disconnected:
  const buttonIcons = {
-    chromecast: { true: 'cast_connected', false: 'cast' },
-    airplay: { true: 'airplay', false: 'airplay' },
-    dlna: { true: 'tv', false: 'tv' }
+    'chromecast': { true: 'cast_connected', false: 'cast' },
+    'airplay': { true: 'airplay', false: 'airplay' },
+    'dlna': { true: 'tv', false: 'tv' }
  }
  castTypes.forEach(function (castType) {
    // Do we show this button (eg. the Chromecast button) at all?
@@ -574,8 +570,7 @@ function renderPlayerControls (state) {
      <i
        key={castType}
        className={'icon device float-right ' + buttonClass}
-        onClick={buttonHandler}
-      >
+        onClick={buttonHandler}>
        {buttonIcon}
      </i>
    ))
@@ -598,8 +593,7 @@ function renderPlayerControls (state) {
    <div key='volume' className='volume float-left'>
      <i
        className='icon volume-icon float-left'
-        onMouseDown={handleVolumeMute}
-      >
+        onMouseDown={handleVolumeMute}>
        {volumeIcon}
      </i>
      <input
@@ -607,8 +601,7 @@ function renderPlayerControls (state) {
        type='range' min='0' max='1' step='0.05'
        value={volume}
        onChange={handleVolumeScrub}
-        style={volumeStyle}
-      />
+        style={volumeStyle} />
    </div>
  ))

@@ -631,11 +624,9 @@ function renderPlayerControls (state) {
  }

  return (
-    <div
-      key='controls' className='controls'
+    <div key='controls' className='controls'
      onMouseEnter={dispatcher('mediaControlsMouseEnter')}
-      onMouseLeave={dispatcher('mediaControlsMouseLeave')}
-    >
+      onMouseLeave={dispatcher('mediaControlsMouseLeave')}>
      {elements}
      {renderCastOptions(state)}
      {renderSubtitleOptions(state)}
@@ -743,14 +734,14 @@ function formatTime (time, total) {
    return '0:00'
  }

-  const totalHours = Math.floor(total / 3600)
-  const totalMinutes = Math.floor(total / 60)
-  const hours = Math.floor(time / 3600)
+  let totalHours = Math.floor(total / 3600)
+  let totalMinutes = Math.floor(total % 3600 / 60)
+  let hours = Math.floor(time / 3600)
  let minutes = Math.floor(time % 3600 / 60)
-  if (totalMinutes > 9 && minutes < 10) {
-    minutes = '0' + minutes
+  if (totalMinutes > 9) {
+    minutes = zeroFill(2, minutes)
  }
-  const seconds = `0${Math.floor(time % 60)}`.slice(-2)
+  let seconds = zeroFill(2, Math.floor(time % 60))

  return (totalHours > 0 ? hours + ':' : '') + minutes + ':' + seconds
 }
--- a/src/renderer/pages/preferences-page.js
+++ b/src/renderer/pages/preferences-page.js
@@ -1,5 +1,5 @@
+const path = require('path')
 const React = require('react')
-const PropTypes = require('prop-types')

 const colors = require('material-ui/styles/colors')
 const Checkbox = require('material-ui/Checkbox').default
@@ -25,9 +25,6 @@ class PreferencesPage extends React.Component {

    this.handleStartupChange =
      this.handleStartupChange.bind(this)
-
-    this.handleSoundNotificationsChange =
-      this.handleSoundNotificationsChange.bind(this)
  }

  downloadPathSelector () {
@@ -36,12 +33,11 @@ class PreferencesPage extends React.Component {
        <PathSelector
          dialog={{
            title: 'Select download directory',
-            properties: ['openDirectory']
+            properties: [ 'openDirectory' ]
          }}
          onChange={this.handleDownloadPathChange}
          title='Download location'
-          value={this.props.state.saved.prefs.downloadPath}
-        />
+          value={this.props.state.saved.prefs.downloadPath} />
      </Preference>
    )
  }
@@ -56,9 +52,8 @@ class PreferencesPage extends React.Component {
        <Checkbox
          className='control'
          checked={!this.props.state.saved.prefs.openExternalPlayer}
-          label='Play torrent media files using WebTorrent'
-          onCheck={this.handleOpenExternalPlayerChange}
-        />
+          label={'Play torrent media files using WebTorrent'}
+          onCheck={this.handleOpenExternalPlayerChange} />
      </Preference>
    )
  }
@@ -73,7 +68,7 @@ class PreferencesPage extends React.Component {
        <Checkbox
          className='control'
          checked={this.props.state.saved.prefs.highestPlaybackPriority}
-          label='Highest Playback Priority'
+          label={'Highest Playback Priority'}
          onCheck={this.handleHighestPlaybackPriorityChange}
        />
        <p>Pauses all active torrents to allow playback to use all of the available bandwidth.</p>
@@ -99,12 +94,12 @@ class PreferencesPage extends React.Component {
        <PathSelector
          dialog={{
            title: 'Select media player app',
-            properties: ['openFile']
+            properties: [ 'openFile' ]
          }}
+          displayValue={playerName}
          onChange={this.handleExternalPlayerPathChange}
          title='External player'
-          value={playerPath}
-        />
+          value={playerPath ? path.dirname(playerPath) : null} />
      </Preference>
    )
  }
@@ -119,7 +114,7 @@ class PreferencesPage extends React.Component {
        <Checkbox
          className='control'
          checked={this.props.state.saved.prefs.autoAddTorrents}
-          label='Watch for new .torrent files and add them immediately'
+          label={'Watch for new .torrent files and add them immediately'}
          onCheck={(e, value) => { this.handleAutoAddTorrentsChange(e, value) }}
        />
      </Preference>
@@ -137,11 +132,11 @@ class PreferencesPage extends React.Component {
    dispatch('updatePreferences', 'autoAddTorrents', isChecked)

    if (isChecked) {
-      dispatch('startFolderWatcher')
+      dispatch('startFolderWatcher', null)
      return
    }

-    dispatch('stopFolderWatcher')
+    dispatch('stopFolderWatcher', null)
  }

  torrentsFolderPathSelector () {
@@ -152,17 +147,17 @@ class PreferencesPage extends React.Component {
        <PathSelector
          dialog={{
            title: 'Select folder to watch for new torrents',
-            properties: ['openDirectory']
+            properties: [ 'openDirectory' ]
          }}
-          onChange={this.handleTorrentsFolderPathChange}
+          displayValue={torrentsFolderPath || ''}
+          onChange={this.handletorrentsFolderPathChange}
          title='Folder to watch'
-          value={torrentsFolderPath}
-        />
+          value={torrentsFolderPath ? path.dirname(torrentsFolderPath) : null} />
      </Preference>
    )
  }

-  handleTorrentsFolderPathChange (filePath) {
+  handletorrentsFolderPathChange (filePath) {
    dispatch('updatePreferences', 'torrentsFolderPath', filePath)
  }

@@ -181,8 +176,7 @@ class PreferencesPage extends React.Component {
        <RaisedButton
          className='control'
          onClick={this.handleSetDefaultApp}
-          label='Make WebTorrent the default'
-        />
+          label='Make WebTorrent the default' />
      </Preference>
    )
  }
@@ -191,40 +185,25 @@ class PreferencesPage extends React.Component {
    dispatch('updatePreferences', 'startup', isChecked)
  }

-  setStartupCheckbox () {
+  setStartupSection () {
    if (config.IS_PORTABLE) {
      return
    }

    return (
-      <Preference>
-        <Checkbox
-          className='control'
-          checked={this.props.state.saved.prefs.startup}
-          label='Open WebTorrent on startup'
-          onCheck={this.handleStartupChange}
-        />
-      </Preference>
+      <PreferencesSection title='Startup'>
+        <Preference>
+          <Checkbox
+            className='control'
+            checked={this.props.state.saved.prefs.startup}
+            label={'Open WebTorrent on startup.'}
+            onCheck={this.handleStartupChange}
+          />
+        </Preference>
+      </PreferencesSection>
    )
  }

-  soundNotificationsCheckbox () {
-    return (
-      <Preference>
-        <Checkbox
-          className='control'
-          checked={this.props.state.saved.prefs.soundNotifications}
-          label='Enable sounds'
-          onCheck={this.handleSoundNotificationsChange}
-        />
-      </Preference>
-    )
-  }
-
-  handleSoundNotificationsChange (e, isChecked) {
-    dispatch('updatePreferences', 'soundNotifications', isChecked)
-  }
-
  handleSetDefaultApp () {
    dispatch('updatePreferences', 'isFileHandler', true)
  }
@@ -250,10 +229,7 @@ class PreferencesPage extends React.Component {
        <PreferencesSection title='Default torrent app'>
          {this.setDefaultAppButton()}
        </PreferencesSection>
-        <PreferencesSection title='General'>
-          {this.setStartupCheckbox()}
-          {this.soundNotificationsCheckbox()}
-        </PreferencesSection>
+        {this.setStartupSection()}
      </div>
    )
  }
@@ -262,7 +238,7 @@ class PreferencesPage extends React.Component {
 class PreferencesSection extends React.Component {
  static get propTypes () {
    return {
-      title: PropTypes.string
+      title: React.PropTypes.string
    }
  }

--- a/src/renderer/pages/torrent-list-page.js
+++ b/src/renderer/pages/torrent-list-page.js
@@ -6,7 +6,7 @@ const LinearProgress = require('material-ui/LinearProgress').default

 const TorrentSummary = require('../lib/torrent-summary')
 const TorrentPlayer = require('../lib/torrent-player')
-const { dispatcher } = require('../lib/dispatcher')
+const { dispatcher, dispatch } = require('../lib/dispatcher')

 module.exports = class TorrentList extends React.Component {
  render () {
@@ -67,8 +67,7 @@ module.exports = class TorrentList extends React.Component {
        style={style}
        className={classes.join(' ')}
        onContextMenu={infoHash && dispatcher('openTorrentContextMenu', infoHash)}
-        onClick={infoHash && dispatcher('toggleSelectTorrent', infoHash)}
-      >
+        onClick={infoHash && dispatcher('toggleSelectTorrent', infoHash)}>
        {this.renderTorrentMetadata(torrentSummary)}
        {infoHash ? this.renderTorrentButtons(torrentSummary) : null}
        {isSelected ? this.renderTorrentDetails(torrentSummary) : null}
@@ -131,8 +130,7 @@ module.exports = class TorrentList extends React.Component {
          }}
          checked={isActive}
          onClick={stopPropagation}
-          onCheck={dispatcher('toggleTorrent', infoHash)}
-        />
+          onCheck={dispatcher('toggleTorrent', infoHash)} />
      )
    }

@@ -149,7 +147,7 @@ module.exports = class TorrentList extends React.Component {
        }
      }
      return (
-        <div key='progress-bar' style={styles.wrapper}>
+        <div style={styles.wrapper}>
          <LinearProgress style={styles.progress} mode='determinate' value={progress} />
        </div>
      )
@@ -202,7 +200,7 @@ module.exports = class TorrentList extends React.Component {
      const minutesStr = (hours || minutes) ? minutes + 'm' : ''
      const secondsStr = seconds + 's'

-      return (<span key='eta'>{hoursStr} {minutesStr} {secondsStr} remaining</span>)
+      return (<span>{hoursStr} {minutesStr} {secondsStr} remaining</span>)
    }

    function renderTorrentStatus () {
@@ -212,9 +210,7 @@ module.exports = class TorrentList extends React.Component {
        else if (torrentSummary.progress.progress === 1) status = 'Not seeding'
        else status = 'Paused'
      } else if (torrentSummary.status === 'downloading') {
-        if (!torrentSummary.progress) status = ''
-        else if (!torrentSummary.progress.ready) status = 'Verifying'
-        else status = 'Downloading'
+        status = 'Downloading'
      } else if (torrentSummary.status === 'seeding') {
        status = 'Seeding'
      } else { // torrentSummary.status is 'new' or something unexpected
@@ -236,9 +232,8 @@ module.exports = class TorrentList extends React.Component {
        <i
          key='play-button'
          title='Start streaming'
-          className='icon play'
-          onClick={dispatcher('playFile', infoHash)}
-        >
+          className={'icon play'}
+          onClick={dispatcher('playFile', infoHash)}>
          play_circle_outline
        </i>
      )
@@ -251,8 +246,7 @@ module.exports = class TorrentList extends React.Component {
          key='delete-button'
          className='icon delete'
          title='Remove torrent'
-          onClick={dispatcher('confirmDeleteTorrent', infoHash, false)}
-        >
+          onClick={dispatcher('confirmDeleteTorrent', infoHash, false)}>
          close
        </i>
      </div>
@@ -318,7 +312,7 @@ module.exports = class TorrentList extends React.Component {
        torrentSummary.progress.files[index]) {
      const fileProg = torrentSummary.progress.files[index]
      isDone = fileProg.numPiecesPresent === fileProg.numPieces
-      progress = Math.floor(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
+      progress = Math.round(100 * fileProg.numPiecesPresent / fileProg.numPieces) + '%'
    }

    // Second, for media files where we saved our position, show how far we got
@@ -361,10 +355,8 @@ module.exports = class TorrentList extends React.Component {
        <td className={'col-size ' + rowClass}>
          {prettyBytes(file.length)}
        </td>
-        <td
-          className='col-select'
-          onClick={dispatcher('toggleTorrentFile', infoHash, index)}
-        >
+        <td className='col-select'
+          onClick={dispatcher('toggleTorrentFile', infoHash, index)}>
          <i className='icon deselect-file'>{isSelected ? 'close' : 'add'}</i>
        </td>
      </tr>
@@ -378,16 +370,16 @@ module.exports = class TorrentList extends React.Component {

    return (
      <div key='radial-progress' className={'radial-progress ' + cssClass}>
-        <div className='circle'>
-          <div className='mask full' style={transformFill}>
-            <div className='fill' style={transformFill} />
+        <div key='circle' className='circle'>
+          <div key='mask-full' className='mask full' style={transformFill}>
+            <div key='fill' className='fill' style={transformFill} />
          </div>
-          <div className='mask half'>
-            <div className='fill' style={transformFill} />
-            <div className='fill fix' style={transformFix} />
+          <div key='mask-half' className='mask half'>
+            <div key='fill' className='fill' style={transformFill} />
+            <div key='fill-fix' className='fill fix' style={transformFix} />
          </div>
        </div>
-        <div className='inset' />
+        <div key='inset' className='inset' />
      </div>
    )
  }
@@ -401,11 +393,21 @@ function getErrorMessage (torrentSummary) {
  const err = torrentSummary.error
  if (err === 'path-missing') {
    return (
-      <span key='path-missing'>
-        Path missing.<br />
-        Fix and restart the app, or delete the torrent.
+      <span>
+        Torrent data missing.<br />
+        Fix or click to
+        <a onClick={(e) => {
+          e.stopPropagation()
+          restartTorrent(torrentSummary)
+        }}>re-download torrent</a>.
      </span>
    )
  }
  return 'Error'
 }
+
+function restartTorrent (summary) {
+  delete summary.path
+  delete summary.error
+  dispatch('startTorrentingSummary', summary.torrentKey)
+}
--- a/src/renderer/webtorrent.js
+++ b/src/renderer/webtorrent.js
@@ -12,6 +12,7 @@ const mm = require('music-metadata')
 const networkAddress = require('network-address')
 const path = require('path')
 const WebTorrent = require('webtorrent')
+const zeroFill = require('zero-fill')

 const crashReporter = require('../crash-reporter')
 const config = require('../config')
@@ -40,9 +41,10 @@ const VERSION = require('../../package.json').version
 *   '0.16.1' -> '0016'
 *   '1.2.5' -> '0102'
 */
-const VERSION_STR = VERSION
-  .replace(/\d*./g, v => `0${v % 100}`.slice(-2))
-  .slice(0, 4)
+const VERSION_STR = VERSION.match(/([0-9]+)/g)
+  .slice(0, 2)
+  .map((v) => zeroFill(2, v))
+  .join('')

 /**
 * Version prefix string (used in peer ID). WebTorrent uses the Azureus-style
@@ -147,7 +149,7 @@ function addTorrentEvents (torrent) {
  torrent.on('error', (err) =>
    ipc.send('wt-error', torrent.key, err.message))
  torrent.on('infoHash', () =>
-    ipc.send('wt-parsed', torrent.key, torrent.infoHash, torrent.magnetURI))
+    ipc.send('wt-infohash', torrent.key, torrent.infoHash))
  torrent.on('metadata', torrentMetadata)
  torrent.on('ready', torrentReady)
  torrent.on('done', torrentDone)
@@ -343,14 +345,12 @@ function getAudioMetadata (infoHash, index) {
  const metadata = { title: file.name }
  ipc.send('wt-audio-metadata', infoHash, index, metadata)

-  const options = {
-    native: false,
+  const options = { native: false,
    skipCovers: true,
    fileSize: file.length,
    observer: event => {
      ipc.send('wt-audio-metadata', infoHash, index, event.metadata)
-    }
-  }
+    } }
  const onMetaData = file.done
    // If completed; use direct file access
    ? mm.parseFile(path.join(torrent.path, file.path), options)
@@ -358,15 +358,11 @@ function getAudioMetadata (infoHash, index) {
    : mm.parseStream(file.createReadStream(), file.name, options)

  onMetaData
-    .then(
-      () => console.log(`metadata for file='${file.name}' completed.`),
-      err => {
-        console.log(
-          `error getting audio metadata for ${infoHash}:${index}`,
-          err
-        )
-      }
-    )
+    .then(() => {
+      console.log(`metadata for file='${file.name}' completed.`)
+    }).catch(function (err) {
+      return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
+    })
 }

 function selectFiles (torrentOrInfoHash, selections) {
--- a/static/linux/postinst
+++ b/static/linux/postinst
@@ -0,0 +1,4 @@
+#!/bin/sh
+set -e
+chmod +x /opt/webtorrent-desktop/WebTorrent
+ln -s -f /opt/webtorrent-desktop/WebTorrent /usr/bin/webtorrent-desktop
--- a/static/linux/prerm
+++ b/static/linux/prerm
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -e
+rm /usr/bin/webtorrent-desktop
--- a/static/linux/webtorrent-desktop.desktop
+++ b/static/linux/webtorrent-desktop.desktop
@@ -0,0 +1,33 @@
+[Desktop Entry]
+Name=$APP_NAME
+Version=1.0
+GenericName=BitTorrent Client
+X-GNOME-FullName=$APP_NAME
+Comment=Download and share files over BitTorrent
+Encoding=UTF-8
+Type=Application
+Icon=webtorrent-desktop
+Terminal=false
+Path=$APP_PATH
+Exec=$EXEC_PATH %U
+TryExec=$TRY_EXEC_PATH
+StartupNotify=false
+Categories=Network;FileTransfer;P2P;
+MimeType=application/x-bittorrent;x-scheme-handler/magnet;x-scheme-handler/stream-magnet;
+
+Actions=CreateNewTorrent;OpenTorrentFile;OpenTorrentAddress;
+
+[Desktop Action CreateNewTorrent]
+Name=Create New Torrent...
+Exec=$EXEC_PATH -n
+Path=$APP_PATH
+
+[Desktop Action OpenTorrentFile]
+Name=Open Torrent File...
+Exec=$EXEC_PATH -o
+Path=$APP_PATH
+
+[Desktop Action OpenTorrentAddress]
+Name=Open Torrent Address...
+Exec=$EXEC_PATH -u
+Path=$APP_PATH
--- a/static/linux/webtorrent-desktop.ejs
+++ b/static/linux/webtorrent-desktop.ejs
@@ -1,26 +0,0 @@
-[Desktop Entry]
-Type=Application
-<% if (version) { %>Version=<%= version %><% } %>
-Name=<%= productName %>
-<% if (genericName) { %>GenericName=<%= genericName %><% } %>
-<% if (description) { %>Comment=<%= description %><% } %>
-Icon=<%= name %>
-<% if (name) { %>Exec=<%= name %> %U<% } %>
-Terminal=false
-Actions=CreateNewTorrent;OpenTorrentFile;OpenTorrentAddress;
-<% if (mimeType && mimeType.length) { %>MimeType=<%= mimeType.join(';') %>;<% } %>
-<% if (categories && categories.length) { %>Categories=<%= categories.join(';') %>;<% } %>
-StartupNotify=true
-<% if (name) { %>StartupWMClass=<%= name %> <% } %>
-
-[Desktop Action CreateNewTorrent]
-Name=Create New Torrent...
-<% if (name) { %>Exec=<%= name %> -n <% } %>
-
-[Desktop Action OpenTorrentFile]
-Name=Open Torrent File...
-<% if (name) { %>Exec=<%= name %> -o <% } %>
-
-[Desktop Action OpenTorrentAddress]
-Name=Open Torrent Address...
-<% if (name) { %>Exec=<%= name %> -u <% } %>
--- a/test/screenshots/darwin/add-torrent-0-percent.png
+++ b/test/screenshots/darwin/add-torrent-0-percent.png
--- a/test/screenshots/darwin/add-torrent-100-percent.png
+++ b/test/screenshots/darwin/add-torrent-100-percent.png
--- a/test/screenshots/darwin/app-basic.png
+++ b/test/screenshots/darwin/app-basic.png
--- a/test/screenshots/darwin/create-torrent-100-percent.png
+++ b/test/screenshots/darwin/create-torrent-100-percent.png
--- a/test/screenshots/darwin/create-torrent-advanced.png
+++ b/test/screenshots/darwin/create-torrent-advanced.png
--- a/test/screenshots/darwin/create-torrent-simple.png
+++ b/test/screenshots/darwin/create-torrent-simple.png
--- a/test/screenshots/darwin/play-torrent-bbb.png
+++ b/test/screenshots/darwin/play-torrent-bbb.png
--- a/test/screenshots/darwin/play-torrent-return.png
+++ b/test/screenshots/darwin/play-torrent-return.png
--- a/test/screenshots/darwin/prefs-basic.png
+++ b/test/screenshots/darwin/prefs-basic.png
--- a/test/screenshots/darwin/torrent-list-cosmos-delete-data.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-delete-data.png
--- a/test/screenshots/darwin/torrent-list-cosmos-deleted.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-deleted.png
--- a/test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png
--- a/test/screenshots/darwin/torrent-list-cosmos-expand-start.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-expand-start.png
--- a/test/screenshots/darwin/torrent-list-cosmos-expand.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-expand.png
--- a/test/screenshots/darwin/torrent-list-delete-prompt.png
+++ b/test/screenshots/darwin/torrent-list-delete-prompt.png
--- a/test/screenshots/darwin/torrent-list-deleted.png
+++ b/test/screenshots/darwin/torrent-list-deleted.png
--- a/test/screenshots/darwin/torrent-list-download-path-missing.png
+++ b/test/screenshots/darwin/torrent-list-download-path-missing.png
--- a/test/screenshots/darwin/torrent-list-download.png
+++ b/test/screenshots/darwin/torrent-list-download.png
--- a/test/screenshots/darwin/torrent-list-start-download.png
+++ b/test/screenshots/darwin/torrent-list-start-download.png
--- a/test/screenshots/darwin/torrent-list.png
+++ b/test/screenshots/darwin/torrent-list.png
--- a/test/setup.js
+++ b/test/setup.js
@@ -1,5 +1,5 @@
 const Application = require('spectron').Application
-const { copyFileSync } = require('fs')
+const cpFile = require('cp-file')
 const fs = require('fs')
 const mkdirp = require('mkdirp')
 const parseTorrent = require('parse-torrent')
@@ -28,15 +28,10 @@ module.exports = {
 // Returns a promise that resolves to a Spectron Application once the app has loaded.
 // Takes a Tape test. Makes some basic assertions to verify that the app loaded correctly.
 function createApp (t) {
-  const userDataDir = process.platform === 'win32'
-    ? path.join('C:\\Windows\\Temp', 'WebTorrentTest')
-    : path.join('/tmp', 'WebTorrentTest')
-
  return new Application({
    path: path.join(__dirname, '..', 'node_modules', '.bin',
      'electron' + (process.platform === 'win32' ? '.cmd' : '')),
    args: ['-r', path.join(__dirname, 'mocks.js'), path.join(__dirname, '..')],
-    chromeDriverArgs: [`--user-data-dir=${userDataDir}`],
    env: { NODE_ENV: 'test' },
    waitTimeout: 10e3
  })
@@ -58,7 +53,7 @@ function waitForLoad (app, t, opts) {
  }).then(function () {
    return app.webContents.getTitle()
  }).then(function (title) {
-    // Note the window title is WebTorrent, this is the HTML <title>
+    // Note the window title is WebTorrent (BETA), this is the HTML <title>
    t.equal(title, 'Main Window', 'html title')
  })
 }
@@ -83,12 +78,6 @@ function endTest (app, t, err) {
 // Otherwise, create the reference screenshot: test/screenshots/<platform>/<name>.png
 function screenshotCreateOrCompare (app, t, name) {
  const ssDir = path.join(__dirname, 'screenshots', process.platform)
-
-  // check that path exists otherwise create it
-  if (!fs.existsSync(ssDir)) {
-    fs.mkdirSync(ssDir)
-  }
-
  const ssPath = path.join(ssDir, name + '.png')
  let ssBuf

@@ -216,12 +205,12 @@ function compareTorrentFile (t, pathActual, fieldsExpected) {
 function extractImportantFields (parsedTorrent) {
  const { infoHash, name, announce, urlList, comment } = parsedTorrent
  const priv = parsedTorrent.private // private is a reserved word in JS
-  return { infoHash, name, announce, urlList, comment, private: priv }
+  return { infoHash, name, announce, urlList, comment, 'private': priv }
 }

 function copy (pathFrom, pathTo) {
  try {
-    copyFileSync(pathFrom, pathTo)
+    cpFile.sync(pathFrom, pathTo)
  } catch (err) {
    // Windows lets us create files and folders under C:\Windows\Temp,
    // but when you try to `copySync` into one of those folders, you get EPERM
--- a/test/test-add-torrent.js
+++ b/test/test-add-torrent.js
@@ -47,8 +47,10 @@ test('create-torrent', function (t) {
      'wss://tracker.fastcast.nz',
      'wss://tracker.openwebtorrent.com'
    ],
-    infoHash: 'b31a80b3dd807c2fdde4c4da1a0db6123fa35883',
+    comment: undefined,
+    infoHash: '4b087858a32e31a0d313b5f9e0a2e13c08c5403f',
    name: 'tmp.jpg',
+    private: false,
    urlList: []
  }