add button to re-download torrent data if missing

2018-10-11 01:10:42 +02:00
130 changed files with 10329 additions and 26182 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,11 @@
 <!-- DO NOT POST LINKS OR REFERENCES TO COPYRIGHTED CONTENT IN YOUR ISSUE. -->
 **What version of WebTorrent Desktop?** (See the 'About WebTorrent' menu)
 **What operating system and version?**
 **What did you do?**
 **What did you expect to happen?**
 **What actually happened?**
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -1,20 +0,0 @@
 ---
 name: "🐞 Bug report"
 about: Report an issue with this software
 title: ''
 labels: ''
 assignees: ''
 ---
 <!-- DO NOT POST LINKS OR REFERENCES TO COPYRIGHTED CONTENT IN YOUR ISSUE. -->
 **What version of WebTorrent Desktop are you using?**
 **What operating system and version?**
 **What happened?**
 **What did you expect to happen?**
 **Are you willing to submit a pull request to fix this bug?**
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
@@ -1,20 +0,0 @@
 ---
 name: "⭐️ Feature request"
 about: Request a new feature to be added
 title: ''
 labels: ''
 assignees: ''
 ---
 <!-- DO NOT POST LINKS OR REFERENCES TO COPYRIGHTED CONTENT IN YOUR ISSUE. -->
 **What version of WebTorrent Desktop are you using?**
 **What operating system and version?**
 **What problem do you want to solve?**
 **What do you think is the correct solution to this problem?**
 **Are you willing to submit a pull request to implement this change?**
--- a/.github/config.yml
+++ b/.github/config.yml
@@ -0,0 +1,19 @@
 # ProBot Request Info (https://probot.github.io/apps/request-info/)
 requestInfoReplyComment: >
  👋 We would appreciate it if you could provide us with more information about this
  issue. <br><br> ![](https://feross.net/s/cats/14.gif)
 requestInfoLabelToAdd: 'need more info'
 # ProBot Welcome (https://probot.github.io/apps/welcome/)
 newPRWelcomeComment: >
  🙌 Thanks for opening this pull request! You're awesome.
  <br><br> ![](https://feross.net/s/cats/6.gif)
 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
@@ -0,0 +1,4 @@
 # ProBot Lock (https://probot.github.io/apps/lock/)
 daysUntilLock: 90
 lockComment: false
--- a/.github/no-response.yml
+++ b/.github/no-response.yml
@@ -0,0 +1,9 @@
 # ProBot No Response (https://probot.github.io/apps/no-response/)
 daysUntilClose: 7
 responseRequiredLabel: 'need more info'
 closeComment: >
  This issue has been automatically closed because there was no response to a
  request for more information from the issue opener. Please leave a comment or
  open a new issue if you have additional information related to this issue.
  <br><br> ![](https://feross.net/s/cats/7.gif)
--- a/.github/stale.yml
+++ b/.github/stale.yml
@@ -0,0 +1,14 @@
 # ProBot Stale (https://probot.github.io/apps/stale/)
 daysUntilStale: 90
 daysUntilClose: 7
 exemptLabels:
  - accepted
  - bug
  - enhancement
  - meta
 staleLabel: stale
 markComment: >
  This issue has been automatically marked as stale because it has not had
  recent activity. It will be closed if no further activity occurs.
 closeComment: false
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,21 +0,0 @@
 name: ci
 on: [push,pull_request]
 jobs:
  test:
    name: Node ${{ matrix.node }} / ${{ matrix.os }}
    runs-on: ${{ matrix.os }}
    strategy:
      fail-fast: false
      matrix:
        os:
          - ubuntu-latest
        node:
          - '16'
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-node@v3
        with:
          node-version: ${{ matrix.node }}
      - run: npm install
      - run: npm run build --if-present
      - run: npm test
--- a/.github/workflows/package.yml
+++ b/.github/workflows/package.yml
@@ -1,69 +0,0 @@
 name: package
 on: 
  workflow_dispatch:
 jobs:
  package_linux:
    runs-on: ubuntu-latest
    steps:
    - uses: actions/checkout@v3
    - uses: actions/setup-node@v3
      with:
        node-version: '16'
    - uses: actions/cache@v3
      with:
        path: ~/.npm
        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
        restore-keys: |
          ${{ runner.os }}-node-
    - run: npm install
    - run: npm run package -- linux
    - uses: actions/upload-artifact@v3
      with:
        name: linux
        path: |
          dist/*.deb
          dist/*.rpm
          dist/*.zip
  package_macos:
    runs-on: macos-latest
    steps:
    - uses: actions/checkout@v3
    - uses: actions/setup-node@v3
      with:
        node-version: '16'
    - uses: actions/cache@v3
      with:
        path: ~/.npm
        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
        restore-keys: |
          ${{ runner.os }}-node-
    - run: npm install
    - run: npm run package -- darwin
    - uses: actions/upload-artifact@v3
      with:
        name: macos
        path: |
          dist/*.dmg
          dist/*.zip
  package_windows:
    runs-on: windows-latest
    steps:
    - uses: actions/checkout@v3
    - uses: actions/setup-node@v3
      with:
        node-version: '16'
    - uses: actions/cache@v3
      with:
        path: ~/.npm
        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
        restore-keys: |
          ${{ runner.os }}-node-
    - run: npm install
    - run: npm run package -- win32
    - uses: actions/upload-artifact@v3
      with:
        name: windows
        path: |
          dist/*.exe
          dist/*.nupkg
          dist/*.zip
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,23 +0,0 @@
 name: Mark stale issues and pull requests
 on:
  schedule:
  - cron: '0 12 * * *'
 jobs:
  stale:
    runs-on: ubuntu-latest
    permissions:
      issues: write
      pull-requests: write
    steps:
    - uses: actions/stale@v6
      with:
        repo-token: ${{ secrets.GITHUB_TOKEN }}
        stale-issue-message: 'Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?'
        stale-pr-message: 'Is this still relevant? If so, what is blocking it? Is there anything you can do to help move it forward?'
        exempt-issue-labels: accepted,blocked,dependency,security,meta
        exempt-pr-labels: accepted,blocked,bug,dependency,security,meta
        stale-issue-label: 'stale'
        stale-pr-label: 'stale'
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,3 @@ node_modules/
 build/
 dist/
 npm-debug.log*
 .vscode/
 # JetBrains IntelliJ IDEA project files
 .idea
 *.iml
--- a/.npmrc
+++ b/.npmrc
@@ -1 +0,0 @@
 package-lock=true
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,3 @@
 language: node_js
 node_js:
  - lts/*
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -39,45 +39,13 @@
 - Nuno Campos (nuno.campos@me.com)
 - Ebrahim Byagowi (ebrahim@gnu.org)
 - Josip Janzic (josip@jjanzic.com)
 - Egor Yurtaev (yurtaev.egor@gmail.com)
 - Emil Bay (github@tixz.dk)
 - 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)
 - Sharon Grossman (sharong1337@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)
 - Дамјан Георгиевски (gdamjan@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)
 - Pieter Goetschalckx (3.14.e.ter@gmail.com)
 - Carey Metcalfe (carey@cmetcalfe.ca)
 - Ameet Kaustav (akaustav@users.noreply.github.com)
 - gpatarin (gael.patarin@outlook.com)
 - Gael Patarin (gael.patarin@outlook.com)
 - Subin Siby (mail@subinsb.com)
 - Hinara (hinara.turevel@gmail.com)
 #### Generated by bin/update-authors.sh.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,92 +1,5 @@
 # WebTorrent Desktop Version History
 ## v0.24.0 - 2020-08-28
 ### Added
 - Support the `.m2ts` video container format ([hicom150](https://github.com/hicom150))
 ### Changed
 - Update to Electron 10.1.0 [\#1864](https://github.com/webtorrent/webtorrent-desktop/pull/1864) ([feross](https://github.com/feross))
 - Update the Windows installer loading image [\#1841](https://github.com/webtorrent/webtorrent-desktop/pull/1841) ([alxhotel](https://github.com/alxhotel))
 ### Fixed
 - Fix music metadata not showing up [\#1847](https://github.com/webtorrent/webtorrent-desktop/pull/1847) ([Borewit](https://github.com/Borewit))
 - Fix the "Play in VLC" functionality [\#1850](https://github.com/webtorrent/webtorrent-desktop/pull/1850) ([Hinara](https://github.com/Hinara))
 - Prevent shortcuts from activating when user input elements are focused [\#1840](https://github.com/webtorrent/webtorrent-desktop/pull/1840) ([subins2000](https://github.com/subins2000))
 ## v0.23.0 - 2020-07-15
 🔒 This release contains a critical security fix. Please update as soon as possible. [\#1837](https://github.com/webtorrent/webtorrent-desktop/issues/1837#issuecomment-729320901)
 ### Added
 - Add macOS Notarization [\#1834](https://github.com/webtorrent/webtorrent-desktop/pull/1834) ([feross](https://github.com/feross))
 ### Changed
 - Update to Electron 10 beta [\#1834](https://github.com/webtorrent/webtorrent-desktop/pull/1834) ([feross](https://github.com/feross))
 ## v0.22.0 - 2020-07-15
 ❤️✨ A new version of WebTorrent Desktop is out! ❤️✨
 ### Added
 - Linux `.rpm` packages and `arm64` builds are now available! [\#1694](https://github.com/webtorrent/webtorrent-desktop/pull/1694) ([hicom150](https://github.com/hicom150))
 - Add support for multiple audio tracks [\#1712](https://github.com/webtorrent/webtorrent-desktop/pull/1712) ([hicom150](https://github.com/hicom150))
 - Improve codec unsupported detection [\#1711](https://github.com/webtorrent/webtorrent-desktop/pull/1711) ([hicom150](https://github.com/hicom150))
 - Report when files are being verified [\#1717](https://github.com/webtorrent/webtorrent-desktop/pull/1717) ([pR0Ps](https://github.com/pR0Ps))
 - Support additional audio files: MPEG-Layer-2, Musepack, Matroska audio, WavePack [\#1772](https://github.com/webtorrent/webtorrent-desktop/pull/1772)
 ### Changed
 - Update to Electron 9 [\#1729](https://github.com/webtorrent/webtorrent-desktop/pull/1729) [\#1832](https://github.com/webtorrent/webtorrent-desktop/issues/1832)
 - Update to music-metadata 4.8.0 [\#1719](https://github.com/webtorrent/webtorrent-desktop/pull/1719) ([Borewit](https://github.com/Borewit))
 - Update Windows build documentation [\#1715](https://github.com/webtorrent/webtorrent-desktop/pull/1715) ([RecoX](https://github.com/RecoX))
 - Remove unneeded dependencies ([feross](https://github.com/feross))
 ### Fixed
 - Fix a few type errors [\#1720](https://github.com/webtorrent/webtorrent-desktop/pull/1720) ([mathiasvr](https://github.com/mathiasvr))
 - Fix electron SUID sandbox error [\#1707](https://github.com/webtorrent/webtorrent-desktop/pull/1707) ([hicom150](https://github.com/hicom150))
 - Fix percentage rounding error [\#1716](https://github.com/webtorrent/webtorrent-desktop/pull/1716) ([pR0Ps](https://github.com/pR0Ps))
 - Fix path-selector in preferences page [\#1702](https://github.com/webtorrent/webtorrent-desktop/pull/1702) ([314eter](https://github.com/314eter))
 - Fix path-selector in preferences page [\#1704](https://github.com/webtorrent/webtorrent-desktop/pull/1702) ([mathiasvr](https://github.com/mathiasvr))
 - Fix: Increase height of 'About' window [\#1737](https://github.com/webtorrent/webtorrent-desktop/pull/1737) ([akaustav](https://github.com/akaustav))
 - Fix "Save Torrent File As..." [\#1743](https://github.com/webtorrent/webtorrent-desktop/pull/1743) ([gpatarin](https://github.com/gpatarin))
 ## v0.21.0 - 2019-09-14
 ### 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,8 +12,8 @@
 <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://github.com/webtorrent/webtorrent-desktop/actions/workflows/ci.yml"><img src="https://github.com/webtorrent/webtorrent-desktop/actions/workflows/ci.yml/badge.svg" alt="GitHub CI action"></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>
  <a href="https://standardjs.com"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard - JavaScript Style Guide"></a>
@@ -35,7 +35,7 @@ Download the latest version of WebTorrent Desktop from
 - Use [Homebrew-Cask](https://github.com/caskroom/homebrew-cask) to install from the command line:
  ```
-  $ brew install --cask webtorrent
+  $ brew cask install webtorrent
  ```
 - Try the (unstable) development version by cloning the Git repository. See the
@@ -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
+[Wine](https://www.winehq.org/) needs to be installed. For example on Mac, first
-to be installed. For example on Mac, first install
+install [XQuartz](http://www.xquartz.org/), then run:
 [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/installation
 ### Privacy
 WebTorrent Desktop collects some basic usage stats to help us make the app better.
--- a/RELEASE_PROCESS.md
+++ b/RELEASE_PROCESS.md
@@ -1,109 +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
  ```
  Move the `.zip` and `.dmg` file somewhere because the next step wipes the `dist/` folder away.
  ```
  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. 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 that the auto-updater is working. (If the auto updater does not run, users will successfully auto update to this new version, and then be stuck there forever.)
  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.
 ### 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.
  Once this PR is merged and Feross redeploys the WebTorrent website,
  hundreds of thousands of users around the world will start auto updating. **Merge with care.**
--- 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/darwin-entitlements.plist
+++ b/bin/darwin-entitlements.plist
@@ -1,12 +0,0 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
  <dict>
    <key>com.apple.security.cs.allow-jit</key>
    <true/>
    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
    <true/>
    <key>com.apple.security.cs.debugger</key>
    <true/>
  </dict>
 </plist>
--- a/bin/extra-lint.js
+++ b/bin/extra-lint.js
@@ -0,0 +1,46 @@
 #!/usr/bin/env node
 const walkSync = require('walk-sync')
 const fs = require('fs')
 const path = require('path')
 let hasErrors = false
 // Find all Javascript source files
 const files = walkSync('src', { globs: ['**/*.js'] })
 console.log('Running extra-lint on ' + files.length + ' files...')
 // Read each file, line by line
 files.forEach(function (file) {
  const filepath = path.join('src', file)
  const lines = fs.readFileSync(filepath, 'utf8').split('\n')
  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'
    }
    if (line.match(/^var /) || line.match(/ var /)) {
      error = 'Use const or let'
    }
    if (error) {
      let name = path.basename(file)
      console.log('%s:%d - %s:\n%s', name, i + 1, error, line)
      hasErrors = true
    }
  })
 })
 if (hasErrors) process.exit(1)
 else console.log('Looks good!')
--- 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
@@ -8,6 +8,7 @@ const cp = require('child_process')
 const electronPackager = require('electron-packager')
 const fs = require('fs')
 const minimist = require('minimist')
 const mkdirp = require('mkdirp')
 const os = require('os')
 const path = require('path')
 const rimraf = require('rimraf')
@@ -36,9 +37,10 @@ const argv = minimist(process.argv.slice(2), {
 })
 function build () {
-  console.log('Installing node_modules...')
+  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)
@@ -69,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
@@ -87,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,
@@ -117,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'
@@ -138,8 +140,8 @@ const win32 = {
  // Build for Windows.
  platform: 'win32',
-  // Build x64 binary only.
+  // Build ia32 and x64 binaries.
-  arch: 'x64',
+  arch: ['ia32', 'x64'],
  // Object hash of application metadata to embed into the executable (Windows only)
  win32metadata: {
@@ -172,8 +174,8 @@ const linux = {
  // Build for Linux.
  platform: 'linux',
-  // Build x64, armv7l, and arm64 binaries.
+  // Build ia32 and x64 binaries.
-  arch: ['x64', 'armv7l', 'arm64']
+  arch: ['ia32', 'x64']
  // Note: Application icon for Linux is specified via the BrowserWindow `icon` option.
 }
@@ -184,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')
@@ -195,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
@@ -216,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' ]
      }
    ]
@@ -239,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'
        }
      }
@@ -266,7 +269,6 @@ function buildDarwin (cb) {
    function signApp (cb) {
      const sign = require('electron-osx-sign')
      const { notarize } = require('electron-notarize')
      /*
       * Sign the app with Apple Developer ID certificates. We sign the app for 2 reasons:
@@ -282,37 +284,16 @@ function buildDarwin (cb) {
       *   - Membership in the Apple Developer Program
       */
      const signOpts = {
        verbose: true,
        app: appPath,
        platform: 'darwin',
-        identity: 'Developer ID Application: WebTorrent, LLC (5MAMC8G3L8)',
+        verbose: true
        hardenedRuntime: true,
        entitlements: path.join(config.ROOT_PATH, 'bin', 'darwin-entitlements.plist'),
        'entitlements-inherit': path.join(config.ROOT_PATH, 'bin', 'darwin-entitlements.plist'),
        'signature-flags': 'library'
      }
      const notarizeOpts = {
        appBundleId: darwin.appBundleId,
        appPath,
        appleId: 'feross@feross.org',
        appleIdPassword: '@keychain:AC_PASSWORD'
      }
      console.log('Mac: Signing app...')
      sign(signOpts, function (err) {
        if (err) return cb(err)
        console.log('Mac: Signed app.')
-
+        cb(null)
        console.log('Mac: Notarizing app...')
        notarize(notarizeOpts).then(
          function () {
            console.log('Mac: Notarized app.')
            cb(null)
          },
          function (err) {
            cb(err)
          })
      })
    }
@@ -375,8 +356,6 @@ function buildDarwin (cb) {
        cb(null)
      })
    }
  }).catch(function (err) {
    cb(err)
  })
 }
@@ -397,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
@@ -416,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) {
+    function packageInstaller (filesPath, destArch, cb) {
-      console.log('Windows: Creating installer...')
+      console.log(`Windows: Creating ${destArch} installer...`)
      const archStr = destArch === 'ia32' ? '-ia32' : ''
      installer.createWindowsInstaller({
        appDirectory: filesPath,
@@ -439,25 +423,34 @@ 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: signWithParams,
        title: config.APP_NAME,
        usePackageJson: false,
        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
@@ -469,39 +462,68 @@ 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) {
+    function packagePortable (filesPath, destArch, cb) {
-      console.log('Windows: Creating portable app...')
+      console.log(`Windows: Creating ${destArch} portable app...`)
      const portablePath = path.join(filesPath, 'Portable Settings')
-      fs.mkdirSync(portablePath, { recursive: true })
+      mkdirp.sync(portablePath)
      const downloadsPath = path.join(portablePath, 'Downloads')
-      fs.mkdirSync(downloadsPath, { recursive: true })
+      mkdirp.sync(downloadsPath)
      const tempPath = path.join(portablePath, 'Temp')
-      fs.mkdirSync(tempPath, { recursive: true })
+      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), function (err, buildPath) {
-  electronPackager(Object.assign({}, all, linux)).then(function (buildPath) {
+    if (err) return cb(err)
    console.log('Linux: Packaged electron. ' + buildPath)
    const tasks = []
@@ -511,102 +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 = {
+    deb.pack({
-      src: filesPath + '/',
+      package: pkg,
-      dest: DIST_PATH,
+      info: {
-      arch: destArch,
+        arch: destArch === 'x64' ? 'amd64' : 'i386',
-      bin: 'WebTorrent',
+        targetDir: DIST_PATH,
-      icon: {
+        depends: 'gconf2, libgtk2.0-0, libnss3, libxss1',
-        '48x48': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png'),
+        scripts: {
-        '256x256': path.join(config.STATIC_PATH, 'linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png')
+          postinst: path.join(config.STATIC_PATH, 'linux', 'postinst'),
-      },
+          prerm: path.join(config.STATIC_PATH, 'linux', 'prerm')
-      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'),
+    }, [{
-      lintianOverrides: [
+      src: ['./**'],
-        'unstripped-binary-or-object',
+      dest: destPath,
-        'embedded-library',
+      expand: true,
-        'missing-dependency-on-libc',
+      cwd: filesPath
-        'changelog-file-missing-in-native-package',
+    }, {
-        'description-synopsis-is-duplicated',
+      src: ['./**'],
-        'setuid-binary',
+      dest: path.join('/usr', 'share'),
-        'binary-without-manpage',
+      expand: true,
-        'shlib-with-executable-bit'
+      cwd: path.join(config.STATIC_PATH, 'linux', 'share')
-      ]
+    }], function (err) {
-    }
+      if (err) return cb(err)
-
+      console.log(`Linux: Created ${destArch} deb.`)
-    installer(options).then(
+      cb(null)
-      () => {
+    })
        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)
    )
  }
  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/bin/update-authors.sh
+++ b/bin/update-authors.sh
@@ -13,7 +13,6 @@ while (<>) {
  next if /(dc\@DCs-MacBook.local)/;
  next if /(rolandoguedes\@gmail.com)/;
  next if /(grunjol\@users.noreply.github.com)/;
  next if /(dependabot)/;
  $seen{$_} = push @authors, "- ", $_;
 }
 END {
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,88 +1,79 @@
 {
  "name": "webtorrent-desktop",
  "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
-  "version": "0.24.0",
+  "version": "0.20.0",
  "author": {
    "name": "WebTorrent, LLC",
    "email": "feross@webtorrent.io",
    "url": "https://webtorrent.io"
  },
  "babel": {
    "plugins": [
      [
        "@babel/plugin-transform-react-jsx",
        {
          "useBuiltIns": true
        }
      ]
    ]
  },
  "bugs": {
    "url": "https://github.com/webtorrent/webtorrent-desktop/issues"
  },
  "dependencies": {
-    "@electron/remote": "2.1.3",
+    "airplayer": "^2.0.0",
-    "airplayer": "github:webtorrent/airplayer#fix-security",
+    "application-config": "^1.0.0",
-    "application-config": "2.0.0",
+    "arch": "^2.0.0",
-    "arch": "2.2.0",
+    "auto-launch": "^4.0.1",
-    "auto-launch": "5.0.5",
+    "bitfield": "^1.0.2",
-    "bitfield": "4.1.0",
+    "capture-frame": "^2.0.0",
-    "capture-frame": "4.0.0",
+    "chokidar": "^2.0.4",
-    "chokidar": "3.5.3",
+    "chromecasts": "^1.9.1",
-    "chromecasts": "1.10.2",
+    "cp-file": "^6.0.0",
-    "create-torrent": "5.0.9",
+    "create-torrent": "^3.24.5",
-    "debounce": "1.2.1",
+    "debounce": "^1.0.0",
-    "dlnacasts": "0.1.0",
+    "deep-equal": "^1.0.1",
-    "drag-drop": "7.2.0",
+    "dlnacasts": "^0.1.0",
-    "es6-error": "4.1.1",
+    "drag-drop": "^4.1.0",
-    "fn-getter": "1.0.0",
+    "es6-error": "^4.0.0",
-    "iso-639-1": "2.1.15",
+    "fn-getter": "^1.0.0",
-    "languagedetect": "2.0.0",
+    "iso-639-1": "^1.2.1",
-    "location-history": "1.1.2",
+    "languagedetect": "^1.1.1",
-    "material-ui": "0.20.2",
+    "location-history": "^1.0.0",
-    "music-metadata": "7.14.0",
+    "material-ui": "^0.17.0",
-    "network-address": "1.1.2",
+    "mkdirp": "^0.5.1",
-    "parse-torrent": "9.1.5",
+    "music-metadata": "^3.1.0",
-    "prettier-bytes": "1.0.4",
+    "network-address": "^1.1.0",
-    "prop-types": "15.8.1",
+    "parse-torrent": "^6.0.1",
-    "react": "17.0.2",
+    "prettier-bytes": "^1.0.1",
-    "react-dom": "17.0.2",
+    "react": "^15.4.2",
-    "rimraf": "4.4.0",
+    "react-dom": "^15.4.2",
-    "run-parallel": "1.2.0",
+    "react-tap-event-plugin": "^2.0.1",
-    "semver": "7.5.2",
+    "rimraf": "^2.5.2",
-    "simple-concat": "1.0.1",
+    "run-parallel": "^1.1.6",
-    "simple-get": "4.0.1",
+    "semver": "^5.1.0",
-    "srt-to-vtt": "1.1.3",
+    "simple-concat": "^1.0.0",
-    "vlc-command": "1.2.0",
+    "simple-get": "^3.0.3",
-    "webtorrent": "1.9.7",
+    "srt-to-vtt": "^1.1.1",
-    "winreg": "1.2.4"
+    "vlc-command": "^1.0.1",
    "webtorrent": "0.x",
    "winreg": "^1.2.0",
    "zero-fill": "^2.2.3"
  },
  "devDependencies": {
-    "@babel/cli": "7.28.6",
+    "babel-eslint": "^9.0.0",
-    "@babel/core": "7.29.0",
+    "buble": "^0.19.3",
-    "@babel/eslint-parser": "7.28.6",
+    "cross-zip": "^2.0.1",
-    "@babel/plugin-transform-react-jsx": "7.28.6",
+    "depcheck": "^0.6.4",
-    "cross-zip": "4.0.0",
+    "electron": "1.6.16",
-    "depcheck": "1.4.7",
+    "electron-osx-sign": "^0.4.10",
-    "electron": "27.3.11",
+    "electron-packager": "~8.5.1",
-    "electron-notarize": "1.2.2",
+    "electron-winstaller": "^2.6.4",
-    "electron-osx-sign": "0.6.0",
+    "gh-release": "^3.2.1",
-    "electron-packager": "17.1.2",
+    "minimist": "^1.2.0",
-    "electron-winstaller": "5.4.0",
+    "nobin-debian-installer": "0.0.10",
-    "gh-release": "7.0.2",
+    "nodemon": "^1.10.2",
-    "minimist": "1.2.8",
+    "opn": "^5.4.0",
-    "nodemon": "2.0.22",
+    "plist": "^3.0.1",
-    "open": "8.4.2",
+    "pngjs": "^3.0.0",
-    "plist": "3.1.0",
+    "run-series": "^1.1.4",
-    "pngjs": "7.0.0",
+    "spectron": "^3.3.0",
-    "run-series": "1.1.9",
+    "standard": "*",
-    "spectron": "19.0.0",
+    "tape": "^4.6.0",
-    "standard": "17.0.0",
+    "walk-sync": "^0.3.1"
    "tape": "5.9.0"
  },
  "engines": {
-    "node": "^16.0.0 || ^18.0.0",
+    "node": ">=4.0.0"
    "npm": "^7.10.0 || ^8.0.0 || ^9.0.0 || ^10.0.0"
  },
  "homepage": "https://webtorrent.io",
  "keywords": [
@@ -98,9 +89,7 @@
  "license": "MIT",
  "main": "index.js",
  "optionalDependencies": {
-    "appdmg": "^0.6.0",
+    "appdmg": "^0.4.3"
    "electron-installer-debian": "^3.2.0",
    "electron-installer-redhat": "^3.4.0"
  },
  "private": true,
  "productName": "WebTorrent",
@@ -109,24 +98,19 @@
    "url": "git://github.com/webtorrent/webtorrent-desktop.git"
  },
  "scripts": {
-    "build": "babel src --out-dir 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",
-    "start": "npm run build && electron --no-sandbox .",
+    "prepublish": "npm run build",
-    "test": "standard && depcheck --ignores=standard,@babel/eslint-parser --ignore-dirs=build,dist",
+    "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",
    "update-authors": "./bin/update-authors.sh",
    "watch": "nodemon --exec \"npm run start\" --ext js,css --ignore build/ --ignore dist/"
  },
  "standard": {
-    "parser": "@babel/eslint-parser"
+    "parser": "babel-eslint"
  },
  "renovate": {
    "extends": [
      "github>webtorrent/renovate-config"
    ]
  }
 }
--- a/src/config.js
+++ b/src/config.js
@@ -1,6 +1,6 @@
 const appConfig = require('application-config')('WebTorrent')
 const path = require('path')
-const { app } = require('electron')
+const electron = require('electron')
 const arch = require('arch')
 const APP_NAME = 'WebTorrent'
@@ -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-${new Date().getFullYear()} ${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_NAME,
-  APP_TEAM,
+  APP_TEAM: APP_TEAM,
-  APP_VERSION,
+  APP_VERSION: APP_VERSION,
-  APP_WINDOW_TITLE: APP_NAME,
+  APP_WINDOW_TITLE: APP_NAME + ' (BETA)',
  CONFIG_PATH: getConfigPath(),
@@ -73,14 +73,12 @@ 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_PORTABLE,
-  IS_PRODUCTION,
+  IS_PRODUCTION: IS_PRODUCTION,
-  IS_TEST,
+  IS_TEST: IS_TEST,
  OS_SYSARCH: arch() === 'x64' ? 'x64' : 'ia32',
@@ -100,8 +98,8 @@ module.exports = {
  WINDOW_MIN_HEIGHT: UI_HEADER_HEIGHT + (UI_TORRENT_HEIGHT * 2), // header + 2 torrents
  WINDOW_MIN_WIDTH: 425,
-  UI_HEADER_HEIGHT,
+  UI_HEADER_HEIGHT: UI_HEADER_HEIGHT,
-  UI_TORRENT_HEIGHT
+  UI_TORRENT_HEIGHT: UI_TORRENT_HEIGHT
 }
 function getConfigPath () {
@@ -126,10 +124,10 @@ function getPath (key) {
    return ''
  } else if (process.type === 'renderer') {
    // Electron renderer process
-    return require('@electron/remote').app.getPath(key)
+    return electron.remote.app.getPath(key)
  } else {
    // Electron main process
-    return app.getPath(key)
+    return electron.app.getPath(key)
  }
 }
--- a/src/crash-reporter.js
+++ b/src/crash-reporter.js
@@ -4,12 +4,11 @@ module.exports = {
 function init () {
  const config = require('./config')
-  const { crashReporter } = require('electron')
+  const electron = require('electron')
-  crashReporter.start({
+  electron.crashReporter.start({
    companyName: config.APP_NAME,
    productName: config.APP_NAME,
-    submitURL: config.CRASH_REPORT_URL,
+    submitURL: config.CRASH_REPORT_URL
    globalExtra: { _companyName: config.APP_NAME },
    compress: true
  })
 }
--- a/src/main/announcement.js
+++ b/src/main/announcement.js
@@ -2,7 +2,7 @@ module.exports = {
  init
 }
-const { dialog } = require('electron')
+const electron = require('electron')
 const config = require('../config')
 const log = require('./log')
@@ -44,11 +44,13 @@ function onResponse (err, res, data) {
    }
  }
-  dialog.showMessageBox({
+  electron.dialog.showMessageBox({
    type: 'info',
    buttons: ['OK'],
    title: data.title,
    message: data.message,
    detail: data.detail
-  })
+  }, noop)
 }
 function noop () {}
--- a/src/main/dialog.js
+++ b/src/main/dialog.js
@@ -6,7 +6,7 @@ module.exports = {
  openFiles
 }
-const { dialog } = require('electron')
+const electron = require('electron')
 const log = require('./log')
 const windows = require('./windows')
@@ -19,7 +19,7 @@ function openSeedFile () {
  log('openSeedFile')
  const opts = {
    title: 'Select a file for the torrent.',
-    properties: ['openFile']
+    properties: [ 'openFile' ]
  }
  showOpenSeed(opts)
 }
@@ -34,13 +34,13 @@ function openSeedDirectory () {
  log('openSeedDirectory')
  const opts = process.platform === 'darwin'
    ? {
-        title: 'Select a file or folder for the torrent.',
+      title: 'Select a file or folder for the torrent.',
-        properties: ['openFile', 'openDirectory']
+      properties: [ 'openFile', 'openDirectory' ]
-      }
+    }
    : {
-        title: 'Select a folder for the torrent.',
+      title: 'Select a folder for the torrent.',
-        properties: ['openDirectory']
+      properties: [ 'openDirectory' ]
-      }
+    }
  showOpenSeed(opts)
 }
@@ -53,18 +53,19 @@ function openFiles () {
  log('openFiles')
  const opts = process.platform === 'darwin'
    ? {
-        title: 'Select a file or folder to add.',
+      title: 'Select a file or folder to add.',
-        properties: ['openFile', 'openDirectory']
+      properties: [ 'openFile', 'openDirectory' ]
-      }
+    }
    : {
-        title: 'Select a file to add.',
+      title: 'Select a file to add.',
-        properties: ['openFile']
+      properties: [ 'openFile' ]
-      }
+    }
  setTitle(opts.title)
-  const selectedPaths = dialog.showOpenDialogSync(windows.main.win, opts)
+  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
-  resetTitle()
+    resetTitle()
-  if (!Array.isArray(selectedPaths)) return
+    if (!Array.isArray(selectedPaths)) return
-  windows.main.dispatch('onOpen', selectedPaths)
+    windows.main.dispatch('onOpen', selectedPaths)
  })
 }
 /*
@@ -76,14 +77,15 @@ function openTorrentFile () {
  const opts = {
    title: 'Select a .torrent file.',
    filters: [{ name: 'Torrent Files', extensions: ['torrent'] }],
-    properties: ['openFile', 'multiSelections']
+    properties: [ 'openFile', 'multiSelections' ]
  }
  setTitle(opts.title)
-  const selectedPaths = dialog.showOpenDialogSync(windows.main.win, opts)
+  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
-  resetTitle()
+    resetTitle()
-  if (!Array.isArray(selectedPaths)) return
+    if (!Array.isArray(selectedPaths)) return
-  selectedPaths.forEach(selectedPath => {
+    selectedPaths.forEach(function (selectedPath) {
-    windows.main.dispatch('addTorrent', selectedPath)
+      windows.main.dispatch('addTorrent', selectedPath)
    })
  })
 }
@@ -114,8 +116,9 @@ function resetTitle () {
 */
 function showOpenSeed (opts) {
  setTitle(opts.title)
-  const selectedPaths = dialog.showOpenDialogSync(windows.main.win, opts)
+  electron.dialog.showOpenDialog(windows.main.win, opts, function (selectedPaths) {
-  resetTitle()
+    resetTitle()
-  if (!Array.isArray(selectedPaths)) return
+    if (!Array.isArray(selectedPaths)) return
-  windows.main.dispatch('showCreateTorrent', selectedPaths)
+    windows.main.dispatch('showCreateTorrent', selectedPaths)
  })
 }
--- a/src/main/dock.js
+++ b/src/main/dock.js
@@ -34,7 +34,7 @@ function setBadge (count) {
  if (process.platform === 'darwin' ||
      (process.platform === 'linux' && app.isUnityRunning())) {
    log(`setBadge: ${count}`)
-    app.badgeCount = Number(count)
+    app.setBadgeCount(Number(count))
  }
 }
--- a/src/main/external-player.js
+++ b/src/main/external-player.js
@@ -17,12 +17,12 @@ let proc = null
 function checkInstall (playerPath, cb) {
  // check for VLC if external player has not been specified by the user
  // otherwise assume the player is installed
-  if (!playerPath) return vlcCommand(cb)
+  if (playerPath == null) return vlcCommand(cb)
  process.nextTick(() => cb(null))
 }
 function spawn (playerPath, url, title) {
-  if (playerPath) return spawnExternal(playerPath, [url])
+  if (playerPath != null) return spawnExternal(playerPath, [url])
  // Try to find and use VLC if external player is not specified
  vlcCommand((err, vlcPath) => {
--- 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,11 +23,14 @@ function uninstall () {
      break
    case 'win32': uninstallWin32()
      break
    case 'linux': uninstallLinux()
      break
  }
 }
 function installDarwin () {
-  const { app } = require('electron')
+  const electron = require('electron')
  const app = electron.app
  // On Mac, only protocols that are listed in `Info.plist` can be set as the
  // default handler at runtime.
@@ -37,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)
@@ -264,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
@@ -1,29 +1,21 @@
 console.time('init')
-require('@electron/remote/main').initialize()
+const electron = require('electron')
-const { app, ipcMain } = require('electron')
+const app = electron.app
 // Start crash reporter early, so it takes effect for child processes
 const crashReporter = require('../crash-reporter')
 crashReporter.init()
 const parallel = require('run-parallel')
 const config = require('../config')
 const crashReporter = require('../crash-reporter')
 const ipc = require('./ipc')
 const log = require('./log')
 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') ||
@@ -46,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 = app.makeSingleInstance(onAppOpen)
-    shouldQuit = true
+  if (shouldQuit) {
    app.quit()
  }
 }
-if (shouldQuit) {
+if (!shouldQuit) {
  app.quit()
 } else {
  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
@@ -67,6 +57,8 @@ function init () {
    app.setPath('temp', path.join(config.CONFIG_PATH, 'Temp'))
  }
  const ipcMain = electron.ipcMain
  let isReady = false // app ready, windows can be created
  app.ipcReady = false // main window has finished loading and IPC is ready
  app.isQuitting = false
@@ -82,9 +74,9 @@ function init () {
    isReady = true
    const state = results.state
-    menu.init()
+    windows.main.init(state, { hidden: hidden })
    windows.main.init(state, { hidden })
    windows.webtorrent.init()
    menu.init()
    // To keep app startup fast, some code is delayed.
    setTimeout(() => {
@@ -99,24 +91,22 @@ 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)
  ipc.init()
-  app.once('ipcReady', () => {
+  app.once('will-finish-launching', function () {
    crashReporter.init()
  })
  app.once('ipcReady', function () {
    log('Command line args:', argv)
    processArgv(argv)
    console.timeEnd('init')
  })
-  app.on('before-quit', e => {
+  app.on('before-quit', function (e) {
    if (app.isQuitting) return
    app.isQuitting = true
@@ -129,7 +119,7 @@ function init () {
    }, 4000) // quit after 4 secs, at most
  })
-  app.on('activate', () => {
+  app.on('activate', function () {
    if (isReady) windows.main.show()
  })
 }
@@ -172,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)
  }
@@ -196,18 +186,14 @@ function onAppOpen (newArgv) {
 // Development: 2 args, eg: electron .
 // Test: 4 args, eg: electron -r .../mocks.js .
 function sliceArgv (argv) {
-  return argv.slice(
+  return argv.slice(config.IS_PRODUCTION ? 1
-    config.IS_PRODUCTION
+    : config.IS_TEST ? 4
-      ? 1
+      : 2)
      : config.IS_TEST
        ? 4
        : 2
  )
 }
 function processArgv (argv) {
-  const torrentIds = []
+  let torrentIds = []
-  argv.forEach(arg => {
+  argv.forEach(function (arg) {
    if (arg === '-n' || arg === '-o' || arg === '-u') {
      // Critical path: Only load the 'dialog' package if it is needed
      const dialog = require('./dialog')
--- a/src/main/ipc.js
+++ b/src/main/ipc.js
@@ -3,7 +3,9 @@ module.exports = {
  setModule
 }
-const { app, ipcMain } = require('electron')
+const electron = require('electron')
 const app = electron.app
 const log = require('./log')
 const menu = require('./menu')
@@ -21,16 +23,18 @@ function setModule (name, module) {
 }
 function init () {
-  ipcMain.once('ipcReady', e => {
+  const ipc = electron.ipcMain
  ipc.once('ipcReady', function (e) {
    app.ipcReady = true
    app.emit('ipcReady')
  })
-  ipcMain.once('ipcReadyWebTorrent', e => {
+  ipc.once('ipcReadyWebTorrent', function (e) {
    app.ipcReadyWebTorrent = true
    log('sending %d queued messages from the main win to the webtorrent window',
      messageQueueMainToWebTorrent.length)
-    messageQueueMainToWebTorrent.forEach(message => {
+    messageQueueMainToWebTorrent.forEach(function (message) {
      windows.webtorrent.send(message.name, ...message.args)
      log('webtorrent: sent queued %s', message.name)
    })
@@ -40,11 +44,11 @@ function init () {
   * Dialog
   */
-  ipcMain.on('openTorrentFile', () => {
+  ipc.on('openTorrentFile', () => {
    const dialog = require('./dialog')
    dialog.openTorrentFile()
  })
-  ipcMain.on('openFiles', () => {
+  ipc.on('openFiles', () => {
    const dialog = require('./dialog')
    dialog.openFiles()
  })
@@ -53,11 +57,11 @@ function init () {
   * Dock
   */
-  ipcMain.on('setBadge', (e, ...args) => {
+  ipc.on('setBadge', (e, ...args) => {
    const dock = require('./dock')
    dock.setBadge(...args)
  })
-  ipcMain.on('downloadFinished', (e, ...args) => {
+  ipc.on('downloadFinished', (e, ...args) => {
    const dock = require('./dock')
    dock.downloadFinished(...args)
  })
@@ -66,7 +70,7 @@ function init () {
   * Player Events
   */
-  ipcMain.on('onPlayerOpen', () => {
+  ipc.on('onPlayerOpen', function () {
    const powerSaveBlocker = require('./power-save-blocker')
    const shortcuts = require('./shortcuts')
    const thumbar = require('./thumbar')
@@ -77,14 +81,14 @@ function init () {
    thumbar.enable()
  })
-  ipcMain.on('onPlayerUpdate', (e, ...args) => {
+  ipc.on('onPlayerUpdate', function (e, ...args) {
    const thumbar = require('./thumbar')
    menu.onPlayerUpdate(...args)
    thumbar.onPlayerUpdate(...args)
  })
-  ipcMain.on('onPlayerClose', () => {
+  ipc.on('onPlayerClose', function () {
    const powerSaveBlocker = require('./power-save-blocker')
    const shortcuts = require('./shortcuts')
    const thumbar = require('./thumbar')
@@ -95,7 +99,7 @@ function init () {
    thumbar.disable()
  })
-  ipcMain.on('onPlayerPlay', () => {
+  ipc.on('onPlayerPlay', function () {
    const powerSaveBlocker = require('./power-save-blocker')
    const thumbar = require('./thumbar')
@@ -103,7 +107,7 @@ function init () {
    thumbar.onPlayerPlay()
  })
-  ipcMain.on('onPlayerPause', () => {
+  ipc.on('onPlayerPause', function () {
    const powerSaveBlocker = require('./power-save-blocker')
    const thumbar = require('./thumbar')
@@ -115,37 +119,37 @@ function init () {
   * Folder Watcher Events
   */
-  ipcMain.on('startFolderWatcher', () => {
+  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()
  })
-  ipcMain.on('stopFolderWatcher', () => {
+  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()
  })
  /**
   * Shell
   */
-  ipcMain.on('openPath', (e, ...args) => {
+  ipc.on('openItem', (e, ...args) => {
    const shell = require('./shell')
-    shell.openPath(...args)
+    shell.openItem(...args)
  })
-  ipcMain.on('showItemInFolder', (e, ...args) => {
+  ipc.on('showItemInFolder', (e, ...args) => {
    const shell = require('./shell')
    shell.showItemInFolder(...args)
  })
-  ipcMain.on('moveItemToTrash', (e, ...args) => {
+  ipc.on('moveItemToTrash', (e, ...args) => {
    const shell = require('./shell')
    shell.moveItemToTrash(...args)
  })
@@ -154,7 +158,7 @@ function init () {
   * File handlers
   */
-  ipcMain.on('setDefaultFileHandler', (e, flag) => {
+  ipc.on('setDefaultFileHandler', (e, flag) => {
    const handlers = require('./handlers')
    if (flag) handlers.install()
@@ -165,7 +169,7 @@ function init () {
   * Auto start on login
   */
-  ipcMain.on('setStartup', (e, flag) => {
+  ipc.on('setStartup', (e, flag) => {
    const startup = require('./startup')
    if (flag) startup.install()
@@ -178,38 +182,36 @@ function init () {
  const main = windows.main
-  ipcMain.on('setAspectRatio', (e, ...args) => main.setAspectRatio(...args))
+  ipc.on('setAspectRatio', (e, ...args) => main.setAspectRatio(...args))
-  ipcMain.on('setBounds', (e, ...args) => main.setBounds(...args))
+  ipc.on('setBounds', (e, ...args) => main.setBounds(...args))
-  ipcMain.on('setProgress', (e, ...args) => main.setProgress(...args))
+  ipc.on('setProgress', (e, ...args) => main.setProgress(...args))
-  ipcMain.on('setTitle', (e, ...args) => main.setTitle(...args))
+  ipc.on('setTitle', (e, ...args) => main.setTitle(...args))
-  ipcMain.on('show', () => main.show())
+  ipc.on('show', () => main.show())
-  ipcMain.on('toggleFullScreen', (e, ...args) => main.toggleFullScreen(...args))
+  ipc.on('toggleFullScreen', (e, ...args) => main.toggleFullScreen(...args))
-  ipcMain.on('setAllowNav', (e, ...args) => menu.setAllowNav(...args))
+  ipc.on('setAllowNav', (e, ...args) => menu.setAllowNav(...args))
  /**
   * External Media Player
   */
-  ipcMain.on('checkForExternalPlayer', (e, path) => {
+  ipc.on('checkForExternalPlayer', function (e, path) {
    const externalPlayer = require('./external-player')
-    externalPlayer.checkInstall(path, err => {
+    externalPlayer.checkInstall(path, function (err) {
      windows.main.send('checkForExternalPlayer', !err)
    })
  })
-  ipcMain.on('openExternalPlayer', (e, ...args) => {
+  ipc.on('openExternalPlayer', (e, ...args) => {
    const externalPlayer = require('./external-player')
    const shortcuts = require('./shortcuts')
    const thumbar = require('./thumbar')
    menu.togglePlaybackControls(false)
    shortcuts.disable()
    thumbar.disable()
    externalPlayer.spawn(...args)
  })
-  ipcMain.on('quitExternalPlayer', () => {
+  ipc.on('quitExternalPlayer', () => {
    const externalPlayer = require('./external-player')
    externalPlayer.kill()
  })
@@ -218,12 +220,11 @@ function init () {
   * Message passing
   */
-  const oldEmit = ipcMain.emit
+  const oldEmit = ipc.emit
-  ipcMain.emit = (name, e, ...args) => {
+  ipc.emit = function (name, e, ...args) {
    // Relay messages between the main window and the WebTorrent hidden window
    if (name.startsWith('wt-') && !app.isQuitting) {
-      console.dir(e.sender.getTitle())
+      if (e.sender.browserWindowOptions.title === 'webtorrent-hidden-window') {
      if (e.sender.getTitle() === 'WebTorrent Hidden Window') {
        // Send message to main window
        windows.main.send(name, ...args)
        log('webtorrent: got %s', name)
@@ -234,8 +235,8 @@ function init () {
      } else {
        // Queue message for webtorrent window, it hasn't finished loading yet
        messageQueueMainToWebTorrent.push({
-          name,
+          name: name,
-          args
+          args: args
        })
        log('webtorrent: queueing %s', name)
      }
@@ -243,6 +244,6 @@ function init () {
    }
    // Emit all other events normally
-    oldEmit.call(ipcMain, name, e, ...args)
+    oldEmit.call(ipc, name, e, ...args)
  }
 }
--- a/src/main/log.js
+++ b/src/main/log.js
@@ -8,9 +8,11 @@ module.exports.error = error
 * where they can be viewed in Developer Tools.
 */
-const { app } = require('electron')
+const electron = require('electron')
 const windows = require('./windows')
 const app = electron.app
 function log (...args) {
  if (app.ipcReady) {
    windows.main.send('log', ...args)
--- a/src/main/menu.js
+++ b/src/main/menu.js
@@ -8,7 +8,9 @@ module.exports = {
  onToggleFullScreen
 }
-const { app, Menu } = require('electron')
+const electron = require('electron')
 const app = electron.app
 const config = require('../config')
 const windows = require('./windows')
@@ -16,8 +18,8 @@ const windows = require('./windows')
 let menu = null
 function init () {
-  menu = Menu.buildFromTemplate(getMenuTemplate())
+  menu = electron.Menu.buildFromTemplate(getMenuTemplate())
-  Menu.setApplicationMenu(menu)
+  electron.Menu.setApplicationMenu(menu)
 }
 function togglePlaybackControls (flag) {
@@ -68,11 +70,12 @@ function onToggleFullScreen (flag) {
 }
 function getMenuItem (label) {
-  for (const menuItem of menu.items) {
+  for (let i = 0; i < menu.items.length; i++) {
-    const submenuItem = menuItem.submenu.items.find(item => item.label === label)
+    const menuItem = menu.items[i].submenu.items.find(function (item) {
-    if (submenuItem) return submenuItem
+      return item.label === label
    })
    if (menuItem) return menuItem
  }
  return {}
 }
 function getMenuTemplate () {
@@ -285,14 +288,6 @@ function getMenuTemplate () {
        {
          label: 'Resume All',
          click: () => windows.main.dispatch('resumeAllTorrents')
        },
        {
          label: 'Remove All From List',
          click: () => windows.main.dispatch('confirmDeleteAllTorrents', false)
        },
        {
          label: 'Remove All Data Files',
          click: () => windows.main.dispatch('confirmDeleteAllTorrents', true)
        }
      ]
    },
@@ -307,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: () => {
@@ -330,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)
          }
        }
      ]
    }
@@ -362,7 +343,8 @@ function getMenuTemplate () {
          type: 'separator'
        },
        {
-          role: 'services'
+          role: 'services',
          submenu: []
        },
        {
          type: 'separator'
--- a/src/main/power-save-blocker.js
+++ b/src/main/power-save-blocker.js
@@ -3,7 +3,7 @@ module.exports = {
  disable
 }
-const { powerSaveBlocker } = require('electron')
+const electron = require('electron')
 const log = require('./log')
 let blockId = 0
@@ -13,11 +13,11 @@ let blockId = 0
 * display.
 */
 function enable () {
-  if (powerSaveBlocker.isStarted(blockId)) {
+  if (electron.powerSaveBlocker.isStarted(blockId)) {
    // If a power saver block already exists, do nothing.
    return
  }
-  blockId = powerSaveBlocker.start('prevent-display-sleep')
+  blockId = electron.powerSaveBlocker.start('prevent-display-sleep')
  log(`powerSaveBlocker.enable: ${blockId}`)
 }
@@ -25,10 +25,10 @@ function enable () {
 * Stop blocking the system from entering low-power mode.
 */
 function disable () {
-  if (!powerSaveBlocker.isStarted(blockId)) {
+  if (!electron.powerSaveBlocker.isStarted(blockId)) {
    // If a power saver block does not exist, do nothing.
    return
  }
-  powerSaveBlocker.stop(blockId)
+  electron.powerSaveBlocker.stop(blockId)
  log(`powerSaveBlocker.disable: ${blockId}`)
 }
--- a/src/main/shell.js
+++ b/src/main/shell.js
@@ -1,11 +1,11 @@
 module.exports = {
  openExternal,
-  openPath,
+  openItem,
  showItemInFolder,
  moveItemToTrash
 }
-const { shell } = require('electron')
+const electron = require('electron')
 const log = require('./log')
 /**
@@ -13,16 +13,15 @@ const log = require('./log')
 */
 function openExternal (url) {
  log(`openExternal: ${url}`)
-  shell.openExternal(url)
+  electron.shell.openExternal(url)
 }
 /**
 * Open the given file in the desktop’s default manner.
 */
-
+function openItem (path) {
-function openPath (path) {
+  log(`openItem: ${path}`)
-  log(`openPath: ${path}`)
+  electron.shell.openItem(path)
  shell.openPath(path)
 }
 /**
@@ -30,7 +29,7 @@ function openPath (path) {
 */
 function showItemInFolder (path) {
  log(`showItemInFolder: ${path}`)
-  shell.showItemInFolder(path)
+  electron.shell.showItemInFolder(path)
 }
 /**
@@ -38,5 +37,5 @@ function showItemInFolder (path) {
 */
 function moveItemToTrash (path) {
  log(`moveItemToTrash: ${path}`)
-  shell.trashItem(path)
+  electron.shell.moveItemToTrash(path)
 }
--- a/src/main/shortcuts.js
+++ b/src/main/shortcuts.js
@@ -3,20 +3,20 @@ module.exports = {
  enable
 }
-const { globalShortcut } = require('electron')
+const electron = require('electron')
 const windows = require('./windows')
 function enable () {
  // Register play/pause media key, available on some keyboards.
-  globalShortcut.register(
+  electron.globalShortcut.register(
    'MediaPlayPause',
    () => windows.main.dispatch('playPause')
  )
-  globalShortcut.register(
+  electron.globalShortcut.register(
    'MediaNextTrack',
    () => windows.main.dispatch('nextTrack')
  )
-  globalShortcut.register(
+  electron.globalShortcut.register(
    'MediaPreviousTrack',
    () => windows.main.dispatch('previousTrack')
  )
@@ -24,7 +24,7 @@ function enable () {
 function disable () {
  // Return the media key to the OS, so other apps can use it.
-  globalShortcut.unregister('MediaPlayPause')
+  electron.globalShortcut.unregister('MediaPlayPause')
-  globalShortcut.unregister('MediaNextTrack')
+  electron.globalShortcut.unregister('MediaNextTrack')
-  globalShortcut.unregister('MediaPreviousTrack')
+  electron.globalShortcut.unregister('MediaPreviousTrack')
 }
--- a/src/main/squirrel-win32.js
+++ b/src/main/squirrel-win32.js
@@ -2,39 +2,150 @@ module.exports = {
  handleEvent
 }
-const { app } = require('electron')
+const cp = require('child_process')
-
+const electron = require('electron')
 const fs = require('fs')
 const os = require('os')
 const path = require('path')
-const spawn = require('child_process').spawn
+
 const app = electron.app
 const handlers = require('./handlers')
 const EXE_NAME = path.basename(process.execPath)
 const UPDATE_EXE = path.join(process.execPath, '..', '..', 'Update.exe')
 const run = (args, done) => {
  spawn(UPDATE_EXE, args, { detached: true })
    .on('close', done)
 }
 function handleEvent (cmd) {
-  if (cmd === '--squirrel-install' || cmd === '--squirrel-updated') {
+  if (cmd === '--squirrel-install') {
-    run([`--createShortcut=${EXE_NAME}`], app.quit)
+    // App was installed. Install desktop/start menu shortcuts.
    createShortcuts(function () {
      // Ensure user sees install splash screen so they realize that Setup.exe actually
      // installed an application and isn't the application itself.
      setTimeout(function () {
        app.quit()
      }, 3000)
    })
    return true
  }
  if (cmd === '--squirrel-updated') {
    // App was updated. (Called on new version of app)
    updateShortcuts(function () {
      app.quit()
    })
    return true
  }
  if (cmd === '--squirrel-uninstall') {
    // App was just uninstalled. Undo anything we did in the --squirrel-install and
    // --squirrel-updated handlers
    // Uninstall .torrent file and magnet link handlers
    handlers.uninstall()
-    run([`--removeShortcut=${EXE_NAME}`], app.quit)
+    // Remove desktop/start menu shortcuts.
    // HACK: add a callback to handlers.uninstall() so we can remove this setTimeout
    setTimeout(function () {
      removeShortcuts(function () {
        app.quit()
      })
    }, 1000)
    return true
  }
  if (cmd === '--squirrel-obsolete') {
    // App will be updated. (Called on outgoing version of app)
    app.quit()
    return true
  }
  if (cmd === '--squirrel-firstrun') {
    // App is running for the first time. Do not quit, allow startup to continue.
    return false
  }
  return false
 }
 /**
 * Spawn a command and invoke the callback when it completes with an error and
 * the output from standard out.
 */
 function spawn (command, args, cb) {
  let stdout = ''
  let error = null
  let child = null
  try {
    child = cp.spawn(command, args)
  } catch (err) {
    // Spawn can throw an error
    process.nextTick(function () {
      cb(error, stdout)
    })
    return
  }
  child.stdout.on('data', function (data) {
    stdout += data
  })
  child.on('error', function (processError) {
    error = processError
  })
  child.on('close', function (code, signal) {
    if (code !== 0 && !error) error = new Error('Command failed: #{signal || code}')
    if (error) error.stdout = stdout
    cb(error, stdout)
  })
 }
 /**
 * Spawn the Squirrel `Update.exe` command with the given arguments and invoke
 * the callback when the command completes.
 */
 function spawnUpdate (args, cb) {
  spawn(UPDATE_EXE, args, cb)
 }
 /**
 * Create desktop and start menu shortcuts using the Squirrel `Update.exe`
 * command.
 */
 function createShortcuts (cb) {
  spawnUpdate(['--createShortcut', EXE_NAME], cb)
 }
 /**
 * Update desktop and start menu shortcuts using the Squirrel `Update.exe`
 * command.
 */
 function updateShortcuts (cb) {
  const homeDir = os.homedir()
  if (homeDir) {
    const desktopShortcutPath = path.join(homeDir, 'Desktop', 'WebTorrent.lnk')
    // If the desktop shortcut was deleted by the user, then keep it deleted.
    fs.access(desktopShortcutPath, function (err) {
      const desktopShortcutExists = !err
      createShortcuts(function () {
        if (desktopShortcutExists) {
          cb()
        } else {
          // Remove the unwanted desktop shortcut that was recreated
          fs.unlink(desktopShortcutPath, cb)
        }
      })
    })
  } else {
    createShortcuts(cb)
  }
 }
 /**
 * Remove desktop and start menu shortcuts using the Squirrel `Update.exe`
 * command.
 */
 function removeShortcuts (cb) {
  spawnUpdate(['--removeShortcut', EXE_NAME], cb)
 }
--- 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[PREV].flags = [ state.hasPrevious ? 'enabled' : 'disabled' ]
-  buttons[NEXT].flags = [state.hasNext ? 'enabled' : 'disabled']
+  buttons[NEXT].flags = [ state.hasNext ? 'enabled' : 'disabled' ]
  update()
 }
--- a/src/main/tray.js
+++ b/src/main/tray.js
@@ -4,7 +4,9 @@ module.exports = {
  setWindowFocus
 }
-const { app, Tray, Menu } = require('electron')
+const electron = require('electron')
 const app = electron.app
 const config = require('../config')
 const windows = require('./windows')
@@ -34,7 +36,7 @@ function setWindowFocus (flag) {
 }
 function initLinux () {
-  checkLinuxTraySupport(err => {
+  checkLinuxTraySupport(function (err) {
    if (!err) createTray()
  })
 }
@@ -44,20 +46,28 @@ function initWin32 () {
 }
 /**
- * Check for libappindicator support before creating tray icon.
+ * Check for libappindicator1 support before creating tray icon
 */
 function checkLinuxTraySupport (cb) {
  const cp = require('child_process')
-  // Check that libappindicator libraries are installed in system.
+  // Check that we're on Ubuntu (or another debian system) and that we have
-  cp.exec('ldconfig -p | grep libappindicator', (err, stdout) => {
+  // libappindicator1. If WebTorrent was installed from the deb file, we should
  // always have it. If it was installed from the zip file, we might not.
  cp.exec('dpkg --get-selections libappindicator1', function (err, stdout) {
    if (err) return cb(err)
-    cb(null)
+    // Unfortunately there's no cleaner way, as far as I can tell, to check
    // whether a debian package is installed:
    if (stdout.endsWith('\tinstall\n')) {
      cb(null)
    } else {
      cb(new Error('debian package not installed'))
    }
  })
 }
 function createTray () {
-  tray = new Tray(getIconPath())
+  tray = new electron.Tray(getIconPath())
  // On Windows, left click opens the app, right click opens the context menu.
  // On Linux, any click (left or right) opens the context menu.
@@ -68,7 +78,7 @@ function createTray () {
 }
 function updateTrayMenu () {
-  const contextMenu = Menu.buildFromTemplate(getMenuTemplate())
+  const contextMenu = electron.Menu.buildFromTemplate(getMenuTemplate())
  tray.setContextMenu(contextMenu)
 }
--- a/src/main/updater.js
+++ b/src/main/updater.js
@@ -2,7 +2,7 @@ module.exports = {
  init
 }
-const { autoUpdater } = require('electron')
+const electron = require('electron')
 const get = require('simple-get')
 const config = require('../config')
@@ -47,31 +47,31 @@ function onResponse (err, res, data) {
 }
 function initDarwinWin32 () {
-  autoUpdater.on(
+  electron.autoUpdater.on(
    'error',
    (err) => log.error(`Update error: ${err.message}`)
  )
-  autoUpdater.on(
+  electron.autoUpdater.on(
    'checking-for-update',
    () => log('Checking for update')
  )
-  autoUpdater.on(
+  electron.autoUpdater.on(
    'update-available',
    () => log('Update available')
  )
-  autoUpdater.on(
+  electron.autoUpdater.on(
    'update-not-available',
    () => log('No update available')
  )
-  autoUpdater.on(
+  electron.autoUpdater.on(
    'update-downloaded',
    (e, notes, name, date, url) => log(`Update downloaded: ${name}: ${url}`)
  )
-  autoUpdater.setFeedURL({ url: AUTO_UPDATE_URL })
+  electron.autoUpdater.setFeedURL(AUTO_UPDATE_URL)
-  autoUpdater.checkForUpdates()
+  electron.autoUpdater.checkForUpdates()
 }
--- a/src/main/user-tasks.js
+++ b/src/main/user-tasks.js
@@ -2,7 +2,9 @@ module.exports = {
  init
 }
-const { app } = require('electron')
+const electron = require('electron')
 const app = electron.app
 /**
 * Add a user task menu to the app icon on right-click. (Windows)
--- a/src/main/windows/about.js
+++ b/src/main/windows/about.js
@@ -4,18 +4,18 @@ const about = module.exports = {
 }
 const config = require('../../config')
-const { BrowserWindow } = require('electron')
+const electron = require('electron')
 function init () {
  if (about.win) {
    return about.win.show()
  }
-  const win = about.win = new BrowserWindow({
+  const win = about.win = new electron.BrowserWindow({
    backgroundColor: '#ECECEC',
    center: true,
    fullscreen: false,
-    height: 250,
+    height: 170,
    icon: getIconPath(),
    maximizable: false,
    minimizable: false,
@@ -24,28 +24,19 @@ function init () {
    skipTaskbar: true,
    title: 'About ' + config.APP_WINDOW_TITLE,
    useContentSize: true,
    webPreferences: {
      nodeIntegration: true,
      contextIsolation: false,
      enableBlinkFeatures: 'AudioVideoTracks',
      enableRemoteModule: true,
      backgroundThrottling: false
    },
    width: 300
  })
  require('@electron/remote/main').enable(win.webContents)
  win.loadURL(config.WINDOW_ABOUT)
-  win.once('ready-to-show', () => {
+  // No menu on the About window
  win.setMenu(null)
  win.once('ready-to-show', function () {
    win.show()
    // No menu on the About window
    // Hack: BrowserWindow removeMenu method not working on electron@7
    // https://github.com/electron/electron/issues/21088
    win.setMenuBarVisibility(false)
  })
-  win.once('closed', () => {
+  win.once('closed', function () {
    about.win = null
  })
 }
--- a/src/main/windows/main.js
+++ b/src/main/windows/main.js
@@ -14,9 +14,11 @@ const main = module.exports = {
  win: null
 }
-const { app, BrowserWindow, screen } = require('electron')
+const electron = require('electron')
 const debounce = require('debounce')
 const app = electron.app
 const config = require('../../config')
 const log = require('../log')
 const menu = require('../menu')
@@ -28,8 +30,9 @@ function init (state, options) {
  const initialBounds = Object.assign(config.WINDOW_INITIAL_BOUNDS, state.saved.bounds)
-  const win = main.win = new BrowserWindow({
+  const win = main.win = new electron.BrowserWindow({
    backgroundColor: '#282828',
    backgroundThrottling: false, // do not throttle animations/timers when page is background
    darkTheme: true, // Forces dark theme (GTK+3)
    height: initialBounds.height,
    icon: getIconPath(), // Window icon (Windows, Linux)
@@ -37,20 +40,12 @@ 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,
      contextIsolation: false,
      enableBlinkFeatures: 'AudioVideoTracks',
      enableRemoteModule: true,
      backgroundThrottling: false
    },
    x: initialBounds.x,
    y: initialBounds.y
  })
  require('@electron/remote/main').enable(win.webContents)
  win.loadURL(config.WINDOW_MAIN)
@@ -66,7 +61,7 @@ function init (state, options) {
    menu.onToggleFullScreen(main.win.isFullScreen())
  })
-  win.webContents.on('will-navigate', (e) => {
+  win.webContents.on('will-navigate', (e, url) => {
    // Prevent drag-and-drop from navigating the Electron window, which can happen
    // before our drag-and-drop handlers have been initialized.
    e.preventDefault()
@@ -91,11 +86,11 @@ function init (state, options) {
  })
  win.on('move', debounce(e => {
-    send('windowBoundsChanged', main.win.getBounds())
+    send('windowBoundsChanged', e.sender.getBounds())
  }, 1000))
  win.on('resize', debounce(e => {
-    send('windowBoundsChanged', main.win.getBounds())
+    send('windowBoundsChanged', e.sender.getBounds())
  }, 1000))
  win.on('close', e => {
@@ -143,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
  }
@@ -152,7 +147,7 @@ function setBounds (bounds, maximize) {
    log('setBounds: maximizing')
    main.win.maximize()
  } else if (maximize === false && main.win.isMaximized()) {
-    log('setBounds: minimizing')
+    log('setBounds: unmaximizing')
    main.win.unmaximize()
  }
@@ -162,7 +157,7 @@ function setBounds (bounds, maximize) {
    log(`setBounds: setting bounds to ${JSON.stringify(bounds)}`)
    if (bounds.x === null && bounds.y === null) {
      // X and Y not specified? By default, center on current screen
-      const scr = screen.getDisplayMatching(main.win.getBounds())
+      const scr = electron.screen.getDisplayMatching(main.win.getBounds())
      bounds.x = Math.round(scr.bounds.x + (scr.bounds.width / 2) - (bounds.width / 2))
      bounds.y = Math.round(scr.bounds.y + (scr.bounds.height / 2) - (bounds.height / 2))
      log(`setBounds: centered to ${JSON.stringify(bounds)}`)
@@ -214,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
@@ -6,13 +6,14 @@ const webtorrent = module.exports = {
  win: null
 }
-const { app, BrowserWindow } = require('electron')
+const electron = require('electron')
 const config = require('../../config')
 function init () {
-  const win = webtorrent.win = new BrowserWindow({
+  const win = webtorrent.win = new electron.BrowserWindow({
    backgroundColor: '#1E1E1E',
    backgroundThrottling: false, // do not throttle animations/timers when page is background
    center: true,
    fullscreen: false,
    fullscreenable: false,
@@ -24,22 +25,14 @@ function init () {
    skipTaskbar: true,
    title: 'webtorrent-hidden-window',
    useContentSize: true,
    webPreferences: {
      nodeIntegration: true,
      contextIsolation: false,
      enableBlinkFeatures: 'AudioVideoTracks',
      enableRemoteModule: true,
      backgroundThrottling: false
    },
    width: 150
  })
  require('@electron/remote/main').enable(win.webContents)
  win.loadURL(config.WINDOW_WEBTORRENT)
  // Prevent killing the WebTorrent process
-  win.on('close', e => {
+  win.on('close', function (e) {
-    if (app.isQuitting) {
+    if (electron.app.isQuitting) {
      return
    }
    e.preventDefault()
@@ -63,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/delete-all-torrents-modal.js
+++ b/src/renderer/components/delete-all-torrents-modal.js
@@ -1,31 +0,0 @@
 const React = require('react')
 const ModalOKCancel = require('./modal-ok-cancel')
 const { dispatch, dispatcher } = require('../lib/dispatcher')
 module.exports = class DeleteAllTorrentsModal extends React.Component {
  render () {
    const { state: { modal: { deleteData } } } = this.props
    const message = deleteData
      ? 'Are you sure you want to remove all the torrents from the list and delete the data files?'
      : 'Are you sure you want to remove all the torrents from the list?'
    const buttonText = deleteData ? 'REMOVE DATA' : 'REMOVE'
    return (
      <div>
        <p><strong>{message}</strong></p>
        <ModalOKCancel
          cancelText='CANCEL'
          onCancel={dispatcher('exitModal')}
          okText={buttonText}
          onOK={handleRemove}
        />
      </div>
    )
    function handleRemove () {
      dispatch('deleteAllTorrents', deleteData)
      dispatch('exitModal')
    }
  }
 }
--- a/src/renderer/components/header.js
+++ b/src/renderer/components/header.js
@@ -6,33 +6,22 @@ class Header extends React.Component {
  render () {
    const loc = this.props.state.location
    return (
-      <div
+      <div className='header'
        className='header'
        onMouseMove={dispatcher('mediaMouseMoved')}
        onMouseEnter={dispatcher('mediaControlsMouseEnter')}
-        onMouseLeave={dispatcher('mediaControlsMouseLeave')}
+        onMouseLeave={dispatcher('mediaControlsMouseLeave')}>
        role='navigation'
      >
        {this.getTitle()}
        <div className='nav left float-left'>
          <i
            className={'icon back ' + (loc.hasBack() ? '' : 'disabled')}
            title='Back'
-            onClick={dispatcher('back')}
+            onClick={dispatcher('back')}>
            role='button'
            aria-disabled={!loc.hasBack()}
            aria-label='Back'
          >
            chevron_left
          </i>
          <i
            className={'icon forward ' + (loc.hasForward() ? '' : 'disabled')}
            title='Forward'
-            onClick={dispatcher('forward')}
+            onClick={dispatcher('forward')}>
            role='button'
            aria-disabled={!loc.hasForward()}
            aria-label='Forward'
          >
            chevron_right
          </i>
        </div>
@@ -56,9 +45,7 @@ class Header extends React.Component {
      <i
        className='icon add'
        title='Add torrent'
-        onClick={dispatcher('openFiles')}
+        onClick={dispatcher('openFiles')}>
        role='button'
      >
        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,8 @@
 const path = require('path')
 const colors = require('material-ui/styles/colors')
-const remote = require('@electron/remote')
+const electron = require('electron')
 const React = require('react')
-const PropTypes = require('prop-types')
+
 const remote = electron.remote
 const RaisedButton = require('material-ui/RaisedButton').default
 const TextField = require('material-ui/TextField').default
@@ -12,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,
+      className: React.PropTypes.string,
-      dialog: PropTypes.object,
+      dialog: React.PropTypes.object,
-      id: PropTypes.string,
+      displayValue: React.PropTypes.string,
-      onChange: PropTypes.func,
+      id: React.PropTypes.string,
-      title: PropTypes.string.isRequired,
+      onChange: React.PropTypes.func,
-      value: PropTypes.string
+      title: React.PropTypes.string.isRequired,
      value: React.PropTypes.string
    }
  }
@@ -30,13 +30,18 @@ class PathSelector extends React.Component {
  handleClick () {
    const opts = Object.assign({
-      defaultPath: path.dirname(this.props.value || ''),
+      defaultPath: this.props.value,
-      properties: ['openFile', 'openDirectory']
+      properties: [ 'openFile', 'openDirectory' ]
    }, this.props.dialog)
-    const filenames = remote.dialog.showOpenDialogSync(remote.getCurrentWindow(), opts)
+    remote.dialog.showOpenDialog(
-    if (!Array.isArray(filenames)) return
+      remote.getCurrentWindow(),
-    this.props.onChange && this.props.onChange(filenames[0])
+      opts,
      (filenames) => {
        if (!Array.isArray(filenames)) return
        this.props.onChange && this.props.onChange(filenames[0])
      }
    )
  }
  render () {
@@ -59,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
    }
@@ -69,14 +74,10 @@ class PathSelector extends React.Component {
        <div className='label' style={labelStyle}>
          {this.props.title}:
        </div>
-        <TextField
+        <TextField className='control' disabled id={id} value={text}
-          className='control' disabled id={id} value={text}
+          inputStyle={textareaStyle} style={textFieldStyle} />
-          inputStyle={textareaStyle} style={textFieldStyle}
+        <RaisedButton className='control' label='Change' onClick={this.handleClick}
-        />
+          style={buttonStyle} />
        <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,
+      defaultExpanded: React.PropTypes.bool,
-      hideLabel: PropTypes.string,
+      hideLabel: React.PropTypes.string,
-      showLabel: 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
@@ -1,5 +1,5 @@
 const React = require('react')
-const { shell } = require('electron')
+const electron = require('electron')
 const ModalOKCancel = require('./modal-ok-cancel')
 const { dispatcher } = require('../lib/dispatcher')
@@ -28,15 +28,14 @@ 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>
    )
  }
  onInstall () {
-    shell.openExternal('https://www.videolan.org/vlc/')
+    electron.shell.openExternal('http://www.videolan.org/vlc/')
    // TODO: dcposch send a dispatch rather than modifying state directly
    const state = this.props.state
--- a/src/renderer/components/update-available-modal.js
+++ b/src/renderer/components/update-available-modal.js
@@ -1,5 +1,5 @@
 const React = require('react')
-const { shell } = require('electron')
+const electron = require('electron')
 const ModalOKCancel = require('./modal-ok-cancel')
 const { dispatch } = require('../lib/dispatcher')
@@ -18,14 +18,13 @@ module.exports = class UpdateAvailableModal extends React.Component {
          cancelText='SKIP THIS RELEASE'
          onCancel={handleSkip}
          okText='SHOW DOWNLOAD PAGE'
-          onOK={handleShow}
+          onOK={handleShow} />
        />
      </div>
    )
    function handleShow () {
      // TODO: use the GitHub urls from config.js
-      shell.openExternal('https://github.com/webtorrent/webtorrent-desktop/releases')
+      electron.shell.openExternal('https://github.com/webtorrent/webtorrent-desktop/releases')
      dispatch('exitModal')
    }
--- a/src/renderer/controllers/audio-tracks-controller.js
+++ b/src/renderer/controllers/audio-tracks-controller.js
@@ -1,17 +0,0 @@
 const { dispatch } = require('../lib/dispatcher')
 module.exports = class AudioTracksController {
  constructor (state) {
    this.state = state
  }
  selectAudioTrack (ix) {
    this.state.playing.audioTracks.selectedIndex = ix
    dispatch('skip', 0.2) // HACK: hardcoded seek value for smooth audio change
  }
  toggleAudioTracksMenu () {
    const audioTracks = this.state.playing.audioTracks
    audioTracks.showMenu = !audioTracks.showMenu
  }
 }
--- a/src/renderer/controllers/media-controller.js
+++ b/src/renderer/controllers/media-controller.js
@@ -23,10 +23,10 @@ module.exports = class MediaController {
      telemetry.logPlayAttempt('error')
      state.playing.location = 'error'
      ipcRenderer.send('checkForExternalPlayer', state.saved.prefs.externalPlayerPath)
-      ipcRenderer.once('checkForExternalPlayer', (e, isInstalled) => {
+      ipcRenderer.once('checkForExternalPlayer', function (e, isInstalled) {
        state.modal = {
          id: 'unsupported-media-modal',
-          error,
+          error: error,
          externalPlayerInstalled: isInstalled
        }
      })
@@ -56,7 +56,7 @@ module.exports = class MediaController {
    const state = this.state
    state.playing.location = 'external'
-    const onServerRunning = () => {
+    const onServerRunning = function () {
      state.playing.isReady = true
      telemetry.logPlayAttempt('external')
--- a/src/renderer/controllers/playback-controller.js
+++ b/src/renderer/controllers/playback-controller.js
@@ -1,4 +1,4 @@
-const { ipcRenderer } = require('electron')
+const electron = require('electron')
 const path = require('path')
 const Cast = require('../lib/cast')
@@ -11,6 +11,8 @@ const TorrentSummary = require('../lib/torrent-summary')
 const Playlist = require('../lib/playlist')
 const State = require('../lib/state')
 const ipcRenderer = electron.ipcRenderer
 // Controls playback of torrents and files within torrents
 // both local (<video>,<audio>,external player) and remote (cast)
 module.exports = class PlaybackController {
@@ -59,12 +61,12 @@ module.exports = class PlaybackController {
  }
  // Open a file in OS default app.
-  openPath (infoHash, index) {
+  openItem (infoHash, index) {
    const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
    const filePath = path.join(
      torrentSummary.path,
      torrentSummary.files[index].path)
-    ipcRenderer.send('openPath', filePath)
+    ipcRenderer.send('openItem', filePath)
  }
  // Toggle (play or pause) the currently playing media
@@ -156,20 +158,6 @@ module.exports = class PlaybackController {
    else this.state.playing.jumpToTime = time
  }
  // Show video preview
  preview (x) {
    if (!Number.isFinite(x)) {
      console.error('Tried to preview a non-finite position ' + x)
      return console.trace()
    }
    this.state.playing.previewXCoord = x
  }
  // Hide video preview
  clearPreview () {
    this.state.playing.previewXCoord = null
  }
  // Change playback speed. 1 = faster, -1 = slower
  // Playback speed ranges from 16 (fast forward) to 1 (normal playback)
  // to 0.25 (quarter-speed playback), then goes to -0.25, -0.5, -1, -2, etc
@@ -281,11 +269,8 @@ 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'
-    state.playing.type = TorrentPlayer.isVideo(fileSummary)
+      : TorrentPlayer.isAudio(fileSummary) ? 'audio'
      ? 'video'
      : TorrentPlayer.isAudio(fileSummary)
        ? 'audio'
        : 'other'
    // pick up where we left off
--- a/src/renderer/controllers/prefs-controller.js
+++ b/src/renderer/controllers/prefs-controller.js
@@ -1,5 +1,5 @@
 const { dispatch } = require('../lib/dispatcher')
-const { ipcRenderer } = require('electron')
+const ipcRenderer = require('electron').ipcRenderer
 // Controls the Preferences screen
 module.exports = class PrefsController {
@@ -13,7 +13,7 @@ module.exports = class PrefsController {
    const state = this.state
    state.location.go({
      url: 'preferences',
-      setup (cb) {
+      setup: function (cb) {
        // initialize preferences
        state.window.title = 'Preferences'
        ipcRenderer.send('setAllowNav', false)
--- a/src/renderer/controllers/subtitles-controller.js
+++ b/src/renderer/controllers/subtitles-controller.js
@@ -1,8 +1,10 @@
-const remote = require('@electron/remote')
+const electron = require('electron')
 const fs = require('fs')
 const path = require('path')
 const parallel = require('run-parallel')
 const remote = electron.remote
 const { dispatch } = require('../lib/dispatcher')
 module.exports = class SubtitlesController {
@@ -11,13 +13,14 @@ module.exports = class SubtitlesController {
  }
  openSubtitles () {
-    const filenames = remote.dialog.showOpenDialogSync({
+    remote.dialog.showOpenDialog({
      title: 'Select a subtitles file.',
-      filters: [{ name: 'Subtitles', extensions: ['vtt', 'srt'] }],
+      filters: [ { name: 'Subtitles', extensions: ['vtt', 'srt'] } ],
-      properties: ['openFile']
+      properties: [ 'openFile' ]
    }, (filenames) => {
      if (!Array.isArray(filenames)) return
      this.addSubtitles(filenames, true)
    })
    if (!Array.isArray(filenames)) return
    this.addSubtitles(filenames, true)
  }
  selectSubtitle (ix) {
@@ -37,11 +40,12 @@ module.exports = class SubtitlesController {
    // Read the files concurrently, then add all resulting subtitle tracks
    const tasks = files.map((file) => (cb) => loadSubtitle(file, cb))
-    parallel(tasks, (err, tracks) => {
+    parallel(tasks, function (err, tracks) {
      if (err) return dispatch('error', err)
-      // No dupes allowed
+      for (let i = 0; i < tracks.length; i++) {
-      tracks.forEach((track, i) => {
+        // No dupes allowed
        const track = tracks[i]
        let trackIndex = subtitles.tracks.findIndex((t) =>
          track.filePath === t.filePath)
@@ -54,7 +58,7 @@ module.exports = class SubtitlesController {
        if (autoSelect && (i === 0 || isSystemLanguage(track.language))) {
          subtitles.selectedIndex = trackIndex
        }
-      })
+      }
      // Finally, make sure no two tracks have the same label
      relabelSubtitles(subtitles)
@@ -93,7 +97,7 @@ function loadSubtitle (file, cb) {
  const vttStream = fs.createReadStream(filePath).pipe(srtToVtt())
-  concat(vttStream, (err, buf) => {
+  concat(vttStream, function (err, buf) {
    if (err) return dispatch('error', 'Can\'t parse subtitles file.')
    // Detect what language the subtitles are in
@@ -106,7 +110,7 @@ function loadSubtitle (file, cb) {
      buffer: 'data:text/vtt;base64,' + buf.toString('base64'),
      language: langDetected,
      label: langDetected,
-      filePath
+      filePath: filePath
    }
    cb(null, track)
@@ -126,7 +130,7 @@ function isSystemLanguage (language) {
 // Labels each track by language, eg 'German', 'English', 'English 2', ...
 function relabelSubtitles (subtitles) {
  const counts = {}
-  subtitles.tracks.forEach(track => {
+  subtitles.tracks.forEach(function (track) {
    const lang = track.language
    counts[lang] = (counts[lang] || 0) + 1
    track.label = counts[lang] > 1 ? (lang + ' ' + counts[lang]) : lang
--- a/src/renderer/controllers/torrent-controller.js
+++ b/src/renderer/controllers/torrent-controller.js
@@ -1,5 +1,5 @@
 const path = require('path')
-const { ipcRenderer } = require('electron')
+const ipcRenderer = require('electron').ipcRenderer
 const TorrentSummary = require('../lib/torrent-summary')
 const sound = require('../lib/sound')
@@ -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)
@@ -25,7 +25,7 @@ module.exports = class TorrentController {
      }
      torrentSummary = {
-        torrentKey,
+        torrentKey: torrentKey,
        status: 'new'
      }
      torrents.unshift(torrentSummary)
@@ -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
@@ -177,7 +177,7 @@ function showDoneNotification (torrent) {
    silent: true
  })
-  notif.onclick = () => {
+  notif.onclick = function () {
    ipcRenderer.send('show')
  }
--- a/src/renderer/controllers/torrent-list-controller.js
+++ b/src/renderer/controllers/torrent-list-controller.js
@@ -1,13 +1,14 @@
 const fs = require('fs')
 const path = require('path')
-const { ipcRenderer, clipboard } = require('electron')
+const electron = require('electron')
 const remote = require('@electron/remote')
 const { dispatch } = require('../lib/dispatcher')
 const { TorrentKeyNotFoundError } = require('../lib/errors')
 const sound = require('../lib/sound')
 const TorrentSummary = require('../lib/torrent-summary')
 const ipcRenderer = electron.ipcRenderer
 const instantIoRegex = /^(https:\/\/)?instant\.io\/#/
 // Controls the torrent list: creating, adding, deleting, & manipulating torrents
@@ -54,7 +55,7 @@ module.exports = class TorrentListController {
    if (files.length === 0 || typeof files[0] !== 'string') {
      this.state.location.go({
        url: 'create-torrent',
-        files,
+        files: files,
        setup: (cb) => {
          this.state.window.title = 'Create New Torrent'
          cb(null)
@@ -94,7 +95,7 @@ module.exports = class TorrentListController {
    if (!fileOrFolder) return start()
    // Existing torrent: check that the path is still there
-    fs.stat(fileOrFolder, err => {
+    fs.stat(fileOrFolder, function (err) {
      if (err) {
        s.error = 'path-missing'
        dispatch('backToList')
@@ -113,10 +114,6 @@ module.exports = class TorrentListController {
    }
  }
  setGlobalTrackers (globalTrackers) {
    ipcRenderer.send('wt-set-global-trackers', globalTrackers)
  }
  // TODO: use torrentKey, not infoHash
  toggleTorrent (infoHash) {
    const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
@@ -160,8 +157,10 @@ module.exports = class TorrentListController {
  prioritizeTorrent (infoHash) {
    this.state.saved.torrents
-      .filter(torrent => ['downloading', 'seeding'].includes(torrent.status)) // Active torrents only.
+      .filter((torrent) => { // We're interested in active torrents only.
-      .forEach((torrent) => { // Pause all active torrents except the one that started playing.
+        return (['downloading', 'seeding'].indexOf(torrent.status) !== -1)
      })
      .map((torrent) => { // Pause all active torrents except the one that started playing.
        if (infoHash === torrent.infoHash) return
        // Pause torrent without playing sounds.
@@ -176,7 +175,7 @@ module.exports = class TorrentListController {
  resumePausedTorrents () {
    console.log('Playback Priority: resuming paused torrents')
    if (!this.state.saved.torrentsToResume || !this.state.saved.torrentsToResume.length) return
-    this.state.saved.torrentsToResume.forEach((infoHash) => {
+    this.state.saved.torrentsToResume.map((infoHash) => {
      this.toggleTorrent(infoHash)
    })
@@ -202,43 +201,26 @@ module.exports = class TorrentListController {
    }
  }
  confirmDeleteAllTorrents (deleteData) {
    this.state.modal = {
      id: 'delete-all-torrents-modal',
      deleteData
    }
  }
  // TODO: use torrentKey, not infoHash
  deleteTorrent (infoHash, deleteData) {
    ipcRenderer.send('wt-stop-torrenting', infoHash)
    const index = this.state.saved.torrents.findIndex((x) => x.infoHash === infoHash)
    if (index > -1) {
      const summary = this.state.saved.torrents[index]
-      deleteTorrentFile(summary, deleteData)
+
      // remove torrent and poster file
      deleteFile(TorrentSummary.getTorrentPath(summary))
      deleteFile(TorrentSummary.getPosterPath(summary))
      // optionally delete the torrent data
      if (deleteData) moveItemToTrash(summary)
      // remove torrent from saved list
      this.state.saved.torrents.splice(index, 1)
      dispatch('stateSave')
      // prevent user from going forward to a deleted torrent
      this.state.location.clearForward('player')
      sound.play('DELETE')
    } else {
      throw new TorrentKeyNotFoundError(infoHash)
    }
  }
  deleteAllTorrents (deleteData) {
    // Go back to list before the current playing torrent is deleted
    if (this.state.location.url() === 'player') {
      dispatch('backToList')
    }
    this.state.saved.torrents.forEach((summary) => deleteTorrentFile(summary, deleteData))
    this.state.saved.torrents = []
    dispatch('stateSave')
    // prevent user from going forward to a deleted torrent
    this.state.location.clearForward('player')
@@ -255,88 +237,77 @@ module.exports = class TorrentListController {
  openTorrentContextMenu (infoHash) {
    const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
-    const menu = new remote.Menu()
+    const menu = new electron.remote.Menu()
-    menu.append(new remote.MenuItem({
+    menu.append(new electron.remote.MenuItem({
      label: 'Remove From List',
      click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, false)
    }))
-    menu.append(new remote.MenuItem({
+    menu.append(new electron.remote.MenuItem({
      label: 'Remove Data File',
      click: () => dispatch('confirmDeleteTorrent', torrentSummary.infoHash, true)
    }))
-    menu.append(new remote.MenuItem({
+    menu.append(new electron.remote.MenuItem({
      type: 'separator'
    }))
    if (torrentSummary.files) {
-      menu.append(new remote.MenuItem({
+      menu.append(new electron.remote.MenuItem({
        label: process.platform === 'darwin' ? 'Show in Finder' : 'Show in Folder',
        click: () => showItemInFolder(torrentSummary)
      }))
-      menu.append(new remote.MenuItem({
+      menu.append(new electron.remote.MenuItem({
        type: 'separator'
      }))
    }
-    menu.append(new remote.MenuItem({
+    menu.append(new electron.remote.MenuItem({
      label: 'Copy Magnet Link to Clipboard',
-      click: () => clipboard.writeText(torrentSummary.magnetURI)
+      click: () => electron.clipboard.writeText(torrentSummary.magnetURI)
    }))
-    menu.append(new remote.MenuItem({
+    menu.append(new electron.remote.MenuItem({
      label: 'Copy Instant.io Link to Clipboard',
-      click: () => clipboard.writeText(`https://instant.io/#${torrentSummary.infoHash}`)
+      click: () => electron.clipboard.writeText(`https://instant.io/#${torrentSummary.infoHash}`)
    }))
-    menu.append(new remote.MenuItem({
+    menu.append(new electron.remote.MenuItem({
      label: 'Save Torrent File As...',
      click: () => dispatch('saveTorrentFileAs', torrentSummary.torrentKey),
      enabled: torrentSummary.torrentFileName != null
    }))
-    menu.append(new remote.MenuItem({
+    menu.popup(electron.remote.getCurrentWindow())
      type: 'separator'
    }))
    const sortedByName = this.state.saved.prefs.sortByName
    menu.append(new remote.MenuItem({
      label: `${sortedByName ? '✓ ' : ''}Sort by Name`,
      click: () => dispatch('updatePreferences', 'sortByName', !sortedByName)
    }))
    menu.popup({ window: remote.getCurrentWindow() })
  }
  // Takes a torrentSummary or torrentKey
  // Shows a Save File dialog, then saves the .torrent file wherever the user requests
  saveTorrentFileAs (torrentKey) {
    const torrentSummary = TorrentSummary.getByKey(this.state, torrentKey)
-    if (!torrentSummary) throw new TorrentKeyNotFoundError(torrentKey)
+    if (!torrentSummary) throw new Error('Missing torrentKey: ' + torrentKey)
    const downloadPath = this.state.saved.prefs.downloadPath
    const newFileName = path.parse(torrentSummary.name).name + '.torrent'
-    const win = remote.getCurrentWindow()
+    const win = electron.remote.getCurrentWindow()
    const opts = {
      title: 'Save Torrent File',
      defaultPath: path.join(downloadPath, newFileName),
      filters: [
        { name: 'Torrent Files', extensions: ['torrent'] },
        { name: 'All Files', extensions: ['*'] }
-      ],
+      ]
      buttonLabel: 'Save'
    }
-    const savePath = remote.dialog.showSaveDialogSync(win, opts)
+    electron.remote.dialog.showSaveDialog(win, opts, function (savePath) {
-
+      console.log('Saving torrent ' + torrentKey + ' to ' + savePath)
-    if (!savePath) return // They clicked Cancel
+      if (!savePath) return // They clicked Cancel
-    console.log('Saving torrent ' + torrentKey + ' to ' + savePath)
+      const torrentPath = TorrentSummary.getTorrentPath(torrentSummary)
-    const torrentPath = TorrentSummary.getTorrentPath(torrentSummary)
+      fs.readFile(torrentPath, function (err, torrentFile) {
    fs.readFile(torrentPath, (err, torrentFile) => {
      if (err) return dispatch('error', err)
      fs.writeFile(savePath, torrentFile, err => {
        if (err) return dispatch('error', err)
        fs.writeFile(savePath, torrentFile, function (err) {
          if (err) return dispatch('error', err)
        })
      })
    })
  }
@@ -347,12 +318,12 @@ module.exports = class TorrentListController {
 function findFilesRecursive (paths, cb_) {
  if (paths.length > 1) {
    let numComplete = 0
-    const ret = []
+    let ret = []
-    paths.forEach(path => {
+    paths.forEach(function (path) {
-      findFilesRecursive([path], fileObjs => {
+      findFilesRecursive([path], function (fileObjs) {
        ret.push(...fileObjs)
        if (++numComplete === paths.length) {
-          ret.sort((a, b) => a.path < b.path ? -1 : Number(a.path > b.path))
+          ret.sort((a, b) => a.path < b.path ? -1 : a.path > b.path)
          cb_(ret)
        }
      })
@@ -361,7 +332,7 @@ function findFilesRecursive (paths, cb_) {
  }
  const fileOrFolder = paths[0]
-  fs.stat(fileOrFolder, (err, stat) => {
+  fs.stat(fileOrFolder, function (err, stat) {
    if (err) return dispatch('error', err)
    // Files: return name, path, and size
@@ -376,7 +347,7 @@ function findFilesRecursive (paths, cb_) {
    // Folders: recurse, make a list of all the files
    const folderPath = fileOrFolder
-    fs.readdir(folderPath, (err, fileNames) => {
+    fs.readdir(folderPath, function (err, fileNames) {
      if (err) return dispatch('error', err)
      const paths = fileNames.map((fileName) => path.join(folderPath, fileName))
      findFilesRecursive(paths, cb_)
@@ -386,7 +357,7 @@ function findFilesRecursive (paths, cb_) {
 function deleteFile (path) {
  if (!path) return
-  fs.unlink(path, err => {
+  fs.unlink(path, function (err) {
    if (err) dispatch('error', err)
  })
 }
@@ -400,14 +371,3 @@ function moveItemToTrash (torrentSummary) {
 function showItemInFolder (torrentSummary) {
  ipcRenderer.send('showItemInFolder', TorrentSummary.getFileOrFolder(torrentSummary))
 }
 function deleteTorrentFile (torrentSummary, deleteData) {
  ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
  // remove torrent and poster file
  deleteFile(TorrentSummary.getTorrentPath(torrentSummary))
  deleteFile(TorrentSummary.getPosterPath(torrentSummary))
  // optionally delete the torrent data
  if (deleteData) moveItemToTrash(torrentSummary)
 }
--- a/src/renderer/controllers/update-controller.js
+++ b/src/renderer/controllers/update-controller.js
@@ -13,7 +13,7 @@ module.exports = class UpdateController {
      console.log('new version skipped by user: v' + version)
      return
    }
-    this.state.modal = { id: 'update-available-modal', version }
+    this.state.modal = { id: 'update-available-modal', version: version }
  }
  // Don't show the modal again until the next version
--- a/src/renderer/lib/cast.js
+++ b/src/renderer/lib/cast.js
@@ -54,17 +54,17 @@ function init (appState, callback) {
  state.devices.airplay = airplayPlayer()
  // Listen for devices: Chromecast, DLNA and Airplay
-  chromecasts.on('update', device => {
+  chromecasts.on('update', function (device) {
    // TODO: how do we tell if there are *no longer* any Chromecasts available?
    // From looking at the code, chromecasts.players only grows, never shrinks
    state.devices.chromecast.addDevice(device)
  })
-  dlnacasts.on('update', device => {
+  dlnacasts.on('update', function (device) {
    state.devices.dlna.addDevice(device)
  })
-  airplayer.on('update', device => {
+  airplayer.on('update', function (device) {
    state.devices.airplay.addDevice(device)
  })
 }
@@ -116,7 +116,7 @@ function chromecastPlayer () {
  }
  function addDevice (device) {
-    device.on('error', err => {
+    device.on('error', function (err) {
      if (device !== ret.device) return
      state.playing.location = 'local'
      state.errors.push({
@@ -125,7 +125,7 @@ function chromecastPlayer () {
      })
      update()
    })
-    device.on('disconnect', () => {
+    device.on('disconnect', function () {
      if (device !== ret.device) return
      state.playing.location = 'local'
      update()
@@ -144,8 +144,8 @@ function chromecastPlayer () {
          'Access-Control-Allow-Origin': '*',
          'Transfer-Encoding': 'chunked'
        })
-        res.end(Buffer.from(selectedSubtitle.buffer.slice(21), 'base64'))
+        res.end(Buffer.from(selectedSubtitle.buffer.substr(21), 'base64'))
-      }).listen(0, () => {
+      }).listen(0, function () {
        const port = ret.subServer.address().port
        const subtitlesUrl = 'http://' + state.server.networkAddress + ':' + port + '/'
        callback(subtitlesUrl)
@@ -155,13 +155,13 @@ function chromecastPlayer () {
  function open () {
    const torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
-    serveSubtitles(subtitlesUrl => {
+    serveSubtitles(function (subtitlesUrl) {
      ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, {
        type: 'video/mp4',
        title: config.APP_NAME + ' - ' + torrentSummary.name,
        subtitles: subtitlesUrl ? [subtitlesUrl] : [],
        autoSubtitles: !!subtitlesUrl
-      }, err => {
+      }, function (err) {
        if (err) {
          state.playing.location = 'local'
          state.errors.push({
@@ -221,7 +221,7 @@ function airplayPlayer () {
  return ret
  function addDevice (player) {
-    player.on('event', event => {
+    player.on('event', function (event) {
      switch (event.state) {
        case 'loading':
          break
@@ -243,7 +243,7 @@ function airplayPlayer () {
  }
  function open () {
-    ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, (err, res) => {
+    ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, function (err, res) {
      if (err) {
        state.playing.location = 'local'
        state.errors.push({
@@ -270,7 +270,7 @@ function airplayPlayer () {
  }
  function status () {
-    ret.device.playbackInfo((err, res, status) => {
+    ret.device.playbackInfo(function (err, res, status) {
      if (err) {
        state.playing.location = 'local'
        state.errors.push({
@@ -317,7 +317,7 @@ function dlnaPlayer (player) {
  }
  function addDevice (device) {
-    device.on('error', err => {
+    device.on('error', function (err) {
      if (device !== ret.device) return
      state.playing.location = 'local'
      state.errors.push({
@@ -326,7 +326,7 @@ function dlnaPlayer (player) {
      })
      update()
    })
-    device.on('disconnect', () => {
+    device.on('disconnect', function () {
      if (device !== ret.device) return
      state.playing.location = 'local'
      update()
@@ -339,7 +339,7 @@ function dlnaPlayer (player) {
      type: 'video/mp4',
      title: config.APP_NAME + ' - ' + torrentSummary.name,
      seek: state.playing.currentTime > 10 ? state.playing.currentTime : 0
-    }, err => {
+    }, function (err) {
      if (err) {
        state.playing.location = 'local'
        state.errors.push({
@@ -374,7 +374,7 @@ function dlnaPlayer (player) {
  }
  function volume (volume, callback) {
-    ret.device.volume(volume, err => {
+    ret.device.volume(volume, function (err) {
      // quick volume update
      state.playing.volume = volume
      callback(err)
@@ -396,7 +396,7 @@ function handleStatus (err, status) {
 // Start polling cast device state, whenever we're connected
 function startStatusInterval () {
-  statusInterval = setInterval(() => {
+  statusInterval = setInterval(function () {
    const player = getPlayer()
    if (player) player.status()
  }, 1000)
@@ -454,7 +454,7 @@ function selectDevice (index) {
 function stop () {
  const player = getPlayer()
  if (player) {
-    player.stop(() => {
+    player.stop(function () {
      player.device = null
      stoppedCasting()
    })
@@ -522,6 +522,6 @@ function setVolume (volume) {
  if (player) player.volume(volume, castCallback)
 }
-function castCallback (...args) {
+function castCallback () {
-  console.log('%s callback: %o', state.playing.location, args)
+  console.log('%s callback: %o', state.playing.location, arguments)
 }
--- a/src/renderer/lib/dispatcher.js
+++ b/src/renderer/lib/dispatcher.js
@@ -5,7 +5,7 @@ module.exports = {
 }
 const dispatchers = {}
-let _dispatch = () => {}
+let _dispatch = function () {}
 function setDispatch (dispatch) {
  _dispatch = dispatch
@@ -23,7 +23,7 @@ function dispatcher (...args) {
  const str = JSON.stringify(args)
  let handler = dispatchers[str]
  if (!handler) {
-    handler = dispatchers[str] = e => {
+    handler = dispatchers[str] = function (e) {
      // Do not propagate click to elements below the button
      e.stopPropagation()
--- a/src/renderer/lib/media-extensions.js
+++ b/src/renderer/lib/media-extensions.js
@@ -1,11 +1,10 @@
 const mediaExtensions = {
  audio: [
-    '.aac', '.aif', '.aiff', '.asf', '.dff', '.dsf', '.flac', '.m2a',
+    '.aac', '.asf', '.flac', '.m2a', '.m4a', '.m4b', '.mp2', '.mp4',
-    '.m2a', '.m4a', '.mpc', '.m4b', '.mka', '.mp2', '.mp3', '.mpc', '.oga',
+    '.mp3', '.oga', '.ogg', '.opus', '.wma', '.wav', '.wv', '.wvp'],
    '.ogg', '.opus', '.spx', '.wma', '.wav', '.wv', '.wvp'],
  video: [
-    '.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', '.mpg', '.mpeg',
+    '.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', 'mpg', 'mpeg',
-    '.ogv', '.webm', '.wmv', '.m2ts'],
+    '.ogv', '.webm', '.wmv'],
  image: ['.gif', '.jpg', '.jpeg', '.png']
 }
--- a/src/renderer/lib/migrations.js
+++ b/src/renderer/lib/migrations.js
@@ -28,31 +28,16 @@ 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.22.0')) migrate_0_22_0(saved)
  if (semver.lt(version, config.APP_VERSION)) {
    installHandlers(state.saved)
  }
  // Config is now on the new version
  state.saved.version = config.APP_VERSION
 }
 // Whenever the app is updated,  re-install default handlers if the user has
 // enabled them.
 function installHandlers (saved) {
  if (saved.prefs.isFileHandler) {
    const ipcRenderer = require('electron').ipcRenderer
    ipcRenderer.send('setDefaultFileHandler', true)
  }
 }
 function migrate_0_7_0 (saved) {
-  const { copyFileSync } = require('fs')
+  const cpFile = require('cp-file')
  const path = require('path')
-  saved.torrents.forEach(ts => {
+  saved.torrents.forEach(function (ts) {
    const infoHash = ts.infoHash
    // Replace torrentPath with torrentFileName
@@ -71,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'
@@ -86,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
@@ -134,7 +119,7 @@ function migrate_0_12_0 (saved) {
    '02767050e0be2fd4db9a2ad6c12416ac806ed6ed.torrent',
    '3ba219a8634bf7bae3d848192b2da75ae995589d.torrent'
  ]
-  saved.torrents.forEach(torrentSummary => {
+  saved.torrents.forEach(function (torrentSummary) {
    if (!defaultTorrentFiles.includes(torrentSummary.torrentFileName)) return
    const fileOrFolder = TorrentSummary.getFileOrFolder(torrentSummary)
    if (!fileOrFolder) return
@@ -148,16 +133,16 @@ function migrate_0_12_0 (saved) {
 }
 function migrate_0_14_0 (saved) {
-  saved.torrents.forEach(ts => {
+  saved.torrents.forEach(function (ts) {
    delete ts.defaultPlayFileIndex
  })
 }
 function migrate_0_17_0 (saved) {
  // Fix a sad, sad bug that resulted in 100MB+ config.json files
-  saved.torrents.forEach(ts => {
+  saved.torrents.forEach(function (ts) {
    if (!ts.files) return
-    ts.files.forEach(file => {
+    ts.files.forEach(function (file) {
      if (!file.audioInfo || !file.audioInfo.picture) return
      // This contained a Buffer, which 30x'd in size when serialized to JSON
      delete file.audioInfo.picture
@@ -170,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.'
@@ -179,7 +164,9 @@ function migrate_0_17_2 (saved) {
  const OLD_HASH = '3ba219a8634bf7bae3d848192b2da75ae995589d'
  const NEW_HASH = 'a88fda5954e89178c372716a6a78b8180ed4dad3'
-  const ts = saved.torrents.find(ts => ts.infoHash === OLD_HASH)
+  const ts = saved.torrents.find((ts) => {
    return ts.infoHash === OLD_HASH
  })
  if (!ts) return // Wired CD torrent does not exist
@@ -203,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')
  )
@@ -219,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_22_0 (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 + '/' +
+    ? state.server.localURL + '/' + state.playing.fileIndex
      encodeURIComponent(state.playing.fileName)
    : ''
 }
--- 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
@@ -3,7 +3,6 @@ const path = require('path')
 const { EventEmitter } = require('events')
 const config = require('../../config')
 const defaultAnnounceList = require('create-torrent').announceList.map((arr) => arr[0])
 const SAVE_DEBOUNCE_INTERVAL = 1000
@@ -13,13 +12,13 @@ const State = module.exports = Object.assign(new EventEmitter(), {
  getDefaultPlayState,
  load,
  // state.save() calls are rate-limited. Use state.saveImmediate() to skip limit.
-  save (...args) {
+  save: function () {
    // Perf optimization: Lazy-require debounce (and it's dependencies)
    const debounce = require('debounce')
    // After first State.save() invokation, future calls go straight to the
    // debounced function
    State.save = debounce(saveImmediate, SAVE_DEBOUNCE_INTERVAL)
-    State.save(...args)
+    State.save(...arguments)
  },
  saveImmediate
 })
@@ -80,7 +79,6 @@ function getDefaultState () {
    getPlayingTorrentSummary,
    getPlayingFileSummary,
    getExternalPlayerName,
    getGlobalTrackers,
    shouldHidePlayerControls
  }
 }
@@ -90,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 */
@@ -107,18 +104,14 @@ function getDefaultPlayState () {
      selectedIndex: -1, /* current subtitle track */
      showMenu: false /* popover menu, above the video */
    },
    audioTracks: {
      tracks: [],
      selectedIndex: 0, /* current audio track */
      showMenu: false /* popover menu, above the video */
    },
    aspectRatio: 0 /* aspect ratio of the video */
  }
 }
 /* If the saved state file doesn't exist yet, here's what we use instead */
-function setupStateSaved () {
+function setupStateSaved (cb) {
-  const { copyFileSync, mkdirSync, readFileSync } = require('fs')
+  const cpFile = require('cp-file')
  const fs = require('fs')
  const parseTorrent = require('parse-torrent')
  const saved = {
@@ -126,41 +119,42 @@ function setupStateSaved () {
      downloadPath: config.DEFAULT_DOWNLOAD_PATH,
      isFileHandler: false,
      openExternalPlayer: false,
-      externalPlayerPath: '',
+      externalPlayerPath: null,
      startup: false,
      soundNotifications: true,
      autoAddTorrents: false,
      torrentsFolderPath: '',
-      highestPlaybackPriority: true,
+      highestPlaybackPriority: true
      globalTrackers: defaultAnnounceList
    },
    torrents: config.DEFAULT_TORRENTS.map(createTorrentObject),
    torrentsToResume: [],
    version: config.APP_VERSION /* make sure we can upgrade gracefully later */
  }
-  // TODO: Doing several sync calls during first startup is not ideal
+  const tasks = []
  mkdirSync(config.POSTER_PATH, { recursive: true })
  mkdirSync(config.TORRENT_PATH, { recursive: true })
  config.DEFAULT_TORRENTS.forEach((t, i) => {
    const infoHash = saved.torrents[i].infoHash
-    // TODO: Doing several sync calls during first startup is not ideal
+    tasks.push(
-    copyFileSync(
+      cpFile(
-      path.join(config.STATIC_PATH, t.posterFileName),
+        path.join(config.STATIC_PATH, t.posterFileName),
-      path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
+        path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
      )
    )
-    copyFileSync(
+    tasks.push(
-      path.join(config.STATIC_PATH, t.torrentFileName),
+      cpFile(
-      path.join(config.TORRENT_PATH, infoHash + '.torrent')
+        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
+    // TODO: Doing several fs.readFileSync calls during first startup is not ideal
-    const torrent = readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
+    const torrent = fs.readFileSync(path.join(config.STATIC_PATH, t.torrentFileName))
    const parsedTorrent = parseTorrent(torrent)
    return {
@@ -201,31 +195,19 @@ function shouldHidePlayerControls () {
    new Date().getTime() - this.playing.mouseStationarySince > 2000 &&
    !this.playing.mouseInControls &&
    !this.playing.isPaused &&
-    this.playing.location === 'local'
+    this.playing.location === 'local' &&
    this.playing.playbackRate === 1
 }
-function getGlobalTrackers () {
+function load (cb) {
-  const trackers = this.saved.prefs.globalTrackers
+  appConfig.read(function (err, saved) {
-  if (!trackers) {
+    if (err || !saved.version) {
-    return defaultAnnounceList
+      console.log('Missing config file: Creating new one')
-  }
+      setupStateSaved(onSavedState)
-  return trackers
+    } else {
-}
+      onSavedState(null, saved)
 async function load (cb) {
  let saved = await appConfig.read()
  if (!saved || !saved.version) {
    console.log('Missing config file: Creating new one')
    try {
      saved = setupStateSaved()
    } catch (err) {
      onSavedState(err)
      return
    }
-  }
+  })
  onSavedState(null, saved)
  function onSavedState (err, saved) {
    if (err) return cb(err)
@@ -243,7 +225,7 @@ async function load (cb) {
 }
 // Write state.saved to the JSON state file
-async function saveImmediate (state, cb) {
+function saveImmediate (state, cb) {
  console.log('Saving state to ' + appConfig.filePath)
  // Clean up, so that we're not saving any pending state
@@ -252,9 +234,9 @@ async function saveImmediate (state, cb) {
  // reading the torrent file or file(s) to seed & don't have an infohash
  copy.torrents = copy.torrents
    .filter((x) => x.infoHash)
-    .map(x => {
+    .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
        }
@@ -266,10 +248,8 @@ async function saveImmediate (state, cb) {
      return torrent
    })
-  try {
+  appConfig.write(copy, (err) => {
-    await appConfig.write(copy)
+    if (err) console.error(err)
-    State.emit('stateSaved')
+    else State.emit('stateSaved')
-  } catch (err) {
+  })
    console.error(err)
  }
 }
--- a/src/renderer/lib/telemetry.js
+++ b/src/renderer/lib/telemetry.js
@@ -7,7 +7,7 @@ module.exports = {
  logPlayAttempt
 }
-const remote = require('@electron/remote')
+const electron = require('electron')
 const config = require('../../config')
@@ -50,7 +50,7 @@ function send (state) {
    json: true
  }
-  get.post(opts, (err, res) => {
+  get.post(opts, function (err, res) {
    if (err) return console.error('Error sending telemetry', err)
    if (res.statusCode !== 200) {
      return console.error(`Error sending telemetry, status code: ${res.statusCode}`)
@@ -74,7 +74,7 @@ function reset () {
 // Track screen resolution
 function getScreenInfo () {
-  return 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 },
@@ -106,14 +106,15 @@ function getTorrentStats (state) {
  }
  // First, count torrents & total file size
-  for (const torrent of state.saved.torrents) {
+  for (let i = 0; i < count; i++) {
-    const stat = byStatus[torrent.status]
+    const t = state.saved.torrents[i]
-    if (!torrent || !torrent.files || !stat) continue
+    const stat = byStatus[t.status]
    if (!t || !t.files || !stat) continue
    stat.count++
-
+    for (let j = 0; j < t.files.length; j++) {
-    for (const file of torrent.files) {
+      const f = t.files[j]
-      if (!file || !file.length) continue
+      if (!f || !f.length) continue
-      const fileSizeMB = file.length / (1 << 20)
+      const fileSizeMB = f.length / (1 << 20)
      sizeMB += fileSizeMB
      stat.sizeMB += fileSizeMB
    }
@@ -144,7 +145,7 @@ function roundPow2 (n) {
  if (n <= 0) return 0
  // Otherwise, return 1, 2, 4, 8, etc by rounding in log space
  const log2 = Math.log(n) / Math.log(2)
-  return 2 ** Math.round(log2)
+  return Math.pow(2, Math.round(log2))
 }
 // An uncaught error happened in the main process or in one of the windows
--- a/src/renderer/lib/time.js
+++ b/src/renderer/lib/time.js
@@ -1,20 +0,0 @@
 module.exports = {
  calculateEta
 }
 function calculateEta (missing, downloadSpeed) {
  if (downloadSpeed === 0 || missing === 0) return
  const rawEta = missing / downloadSpeed
  const hours = Math.floor(rawEta / 3600) % 24
  const minutes = Math.floor(rawEta / 60) % 60
  const seconds = Math.floor(rawEta % 60)
  // Only display hours and minutes if they are greater than 0 but always
  // display minutes if hours is being displayed
  const hoursStr = hours ? hours + ' h' : ''
  const minutesStr = (hours || minutes) ? minutes + ' min' : ''
  const secondsStr = seconds + ' s'
  return `${hoursStr} ${minutesStr} ${secondsStr} remaining`
 }
--- 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)
+  const isTorrentFile = getFileExtension(file) === '.torrent'
-}
+  const isMagnet = typeof file === 'string' && /^(stream-)?magnet:/.test(file)
-
+  return isTorrentFile || isMagnet
 function isTorrentFile (file) {
  return getFileExtension(file) === '.torrent'
 }
 function isMagnetLink (link) {
  return typeof link === 'string' && /^(stream-)?magnet:/.test(link)
 }
 function getFileExtension (file) {
--- a/src/renderer/lib/torrent-poster.js
+++ b/src/renderer/lib/torrent-poster.js
@@ -9,14 +9,19 @@ const msgNoSuitablePoster = 'Cannot generate a poster from any files in the torr
 function torrentPoster (torrent, cb) {
  // First, try to use a poster image if available
-  const posterFile = torrent.files.filter(file => /^poster\.(jpg|png|gif)$/.test(file.name))[0]
+  const posterFile = torrent.files.filter(function (file) {
    return /^poster\.(jpg|png|gif)$/.test(file.name)
  })[0]
  if (posterFile) return extractPoster(posterFile, cb)
  // 'score' each media type based on total size present in torrent
-  const bestScore = ['audio', 'video', 'image'].map(mediaType => ({
+  const bestScore = ['audio', 'video', 'image'].map(mediaType => {
-    type: mediaType,
+    return {
-    size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType])
+      type: mediaType,
-  })).sort((a, b) => b.size - a.size)[0] // sort descending on size
+      size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType]) }
  }).sort((a, b) => { // sort descending on size
    return b.size - a.size
  })[0]
  if (bestScore.size === 0) {
    // Admit defeat, no video, audio or image had a significant presence
@@ -45,7 +50,9 @@ function calculateDataLengthByExtension (torrent, extensions) {
  if (files.length === 0) return 0
  return files
    .map(file => file.length)
-    .reduce((a, b) => a + b)
+    .reduce((a, b) => {
      return a + b
    })
 }
 /**
@@ -57,14 +64,16 @@ function calculateDataLengthByExtension (torrent, extensions) {
 function getLargestFileByExtension (torrent, extensions) {
  const files = filterOnExtension(torrent, extensions)
  if (files.length === 0) return undefined
-  return files.reduce((a, b) => a.length > b.length ? a : b)
+  return files.reduce((a, b) => {
    return a.length > b.length ? a : b
  })
 }
 /**
 * Filter file on a list extension, can be used to find al image files
 * @param torrent Torrent to filter files from
 * @param extensions File extensions to filter on
- * @returns {Array} Array of torrent file objects matching one of the given extensions
+ * @returns {number} Array of torrent file objects matching one of the given extensions
 */
 function filterOnExtension (torrent, extensions) {
  return torrent.files.filter(file => {
@@ -89,7 +98,7 @@ function scoreAudioCoverFile (imgFile) {
    spectrogram: -80
  }
-  for (const keyword in relevanceScore) {
+  for (let keyword in relevanceScore) {
    if (fileName === keyword) {
      return relevanceScore[keyword]
    }
@@ -105,10 +114,12 @@ function torrentPosterFromAudio (torrent, cb) {
  if (imageFiles.length === 0) return cb(new Error(msgNoSuitablePoster))
-  const bestCover = imageFiles.map(file => ({
+  const bestCover = imageFiles.map(file => {
-    file,
+    return {
-    score: scoreAudioCoverFile(file)
+      file: file,
-  })).reduce((a, b) => {
+      score: scoreAudioCoverFile(file)
    }
  }).reduce((a, b) => {
    if (a.score > b.score) {
      return a
    }
@@ -154,8 +165,7 @@ function torrentPosterFromVideo (torrent, cb) {
    function onSeeked () {
      video.removeEventListener('seeked', onSeeked)
-      const frame = captureFrame(video)
+      const buf = captureFrame(video)
      const buf = frame && frame.image
      // unload video element
      video.pause()
@@ -178,5 +188,5 @@ function torrentPosterFromImage (torrent, cb) {
 function extractPoster (file, cb) {
  const extname = path.extname(file.name)
-  file.getBuffer((err, buf) => cb(err, buf, extname))
+  file.getBuffer((err, buf) => { return cb(err, buf, extname) })
 }
--- 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 {}
@@ -14,6 +14,9 @@ Module.prototype.require = function (id) {
 console.time('init')
 const crashReporter = require('../crash-reporter')
 crashReporter.init()
 // Perf optimization: Start asynchronously read on config file before all the
 // blocking require() calls below.
@@ -36,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
@@ -71,7 +77,6 @@ function onState (err, _state) {
  window.dispatch = dispatch
  telemetry.init(state)
  sound.init(state)
  // Log uncaught JS errors
  window.addEventListener(
@@ -96,15 +101,13 @@ function onState (err, _state) {
      const SubtitlesController = require('./controllers/subtitles-controller')
      return new SubtitlesController(state)
    }),
    audioTracks: createGetter(() => {
      const AudioTracksController = require('./controllers/audio-tracks-controller')
      return new AudioTracksController(state)
    }),
    torrent: createGetter(() => {
      const TorrentController = require('./controllers/torrent-controller')
      return new TorrentController(state)
    }),
-    torrentList: createGetter(() => new TorrentListController(state)),
+    torrentList: createGetter(() => {
      return new TorrentListController(state)
    }),
    update: createGetter(() => {
      const UpdateController = require('./controllers/update-controller')
      return new UpdateController(state)
@@ -124,17 +127,11 @@ function onState (err, _state) {
    }
  })
  // Give global trackers
  setGlobalTrackers()
  // Restart everything we were torrenting last time the app ran
  resumeTorrents()
  // Initialize ReactDOM
-  ReactDOM.render(
+  app = ReactDOM.render(<App state={state} />, document.querySelector('#body'))
    <App state={state} ref={elem => { app = elem }} />,
    document.querySelector('#body')
  )
  // Calling update() updates the UI given the current state
  // Do this at least once a second to give every file in every torrentSummary
@@ -153,14 +150,11 @@ function onState (err, _state) {
  // ...same thing if you paste a torrent
  document.addEventListener('paste', onPaste)
-  // Add YouTube style hotkey shortcuts
+  const debouncedFullscreenToggle = debounce(function () {
  window.addEventListener('keydown', onKeydown)
  const debouncedFullscreenToggle = debounce(() => {
    dispatch('toggleFullScreen')
  }, 1000, true)
-  document.addEventListener('wheel', event => {
+  document.addEventListener('wheel', function (event) {
    // ctrlKey detects pinch to zoom, http://crbug.com/289887
    if (event.ctrlKey) {
      event.preventDefault()
@@ -240,112 +234,100 @@ function updateElectron () {
 const dispatchHandlers = {
  // Torrent list: creating, deleting, selecting torrents
-  openTorrentFile: () => ipcRenderer.send('openTorrentFile'),
+  'openTorrentFile': () => ipcRenderer.send('openTorrentFile'),
-  openFiles: () => ipcRenderer.send('openFiles'), /* shows the open file dialog */
+  'openFiles': () => ipcRenderer.send('openFiles'), /* shows the open file dialog */
-  openTorrentAddress: () => { state.modal = { id: 'open-torrent-address-modal' } },
+  'openTorrentAddress': () => { state.modal = { id: 'open-torrent-address-modal' } },
-  addTorrent: (torrentId) => controllers.torrentList().addTorrent(torrentId),
+  'addTorrent': (torrentId) => controllers.torrentList().addTorrent(torrentId),
-  showCreateTorrent: (paths) => controllers.torrentList().showCreateTorrent(paths),
+  'showCreateTorrent': (paths) => controllers.torrentList().showCreateTorrent(paths),
-  createTorrent: (options) => controllers.torrentList().createTorrent(options),
+  'createTorrent': (options) => controllers.torrentList().createTorrent(options),
-  toggleTorrent: (infoHash) => controllers.torrentList().toggleTorrent(infoHash),
+  'toggleTorrent': (infoHash) => controllers.torrentList().toggleTorrent(infoHash),
-  pauseAllTorrents: () => controllers.torrentList().pauseAllTorrents(),
+  'pauseAllTorrents': () => controllers.torrentList().pauseAllTorrents(),
-  resumeAllTorrents: () => controllers.torrentList().resumeAllTorrents(),
+  'resumeAllTorrents': () => controllers.torrentList().resumeAllTorrents(),
-  toggleTorrentFile: (infoHash, index) =>
+  '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),
-  openTorrentListContextMenu: () => onPaste(),
+  'toggleSelectTorrent': (infoHash) =>
  confirmDeleteAllTorrents: (deleteData) =>
    controllers.torrentList().confirmDeleteAllTorrents(deleteData),
  deleteAllTorrents: (deleteData) =>
    controllers.torrentList().deleteAllTorrents(deleteData),
  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),
+  'prioritizeTorrent': (infoHash) => controllers.torrentList().prioritizeTorrent(infoHash),
-  resumePausedTorrents: () => controllers.torrentList().resumePausedTorrents(),
+  'resumePausedTorrents': () => controllers.torrentList().resumePausedTorrents(),
  // Playback
-  playFile: (infoHash, index) => controllers.playback().playFile(infoHash, index),
+  'playFile': (infoHash, index) => controllers.playback().playFile(infoHash, index),
-  playPause: () => controllers.playback().playPause(),
+  'playPause': () => controllers.playback().playPause(),
-  nextTrack: () => controllers.playback().nextTrack(),
+  'nextTrack': () => controllers.playback().nextTrack(),
-  previousTrack: () => controllers.playback().previousTrack(),
+  'previousTrack': () => controllers.playback().previousTrack(),
-  skip: (time) => controllers.playback().skip(time),
+  'skip': (time) => controllers.playback().skip(time),
-  skipTo: (time) => controllers.playback().skipTo(time),
+  'skipTo': (time) => controllers.playback().skipTo(time),
-  preview: (x) => controllers.playback().preview(x),
+  'changePlaybackRate': (dir) => controllers.playback().changePlaybackRate(dir),
-  clearPreview: () => controllers.playback().clearPreview(),
+  'changeVolume': (delta) => controllers.playback().changeVolume(delta),
-  changePlaybackRate: (dir) => controllers.playback().changePlaybackRate(dir),
+  'setVolume': (vol) => controllers.playback().setVolume(vol),
-  changeVolume: (delta) => controllers.playback().changeVolume(delta),
+  'openItem': (infoHash, index) => controllers.playback().openItem(infoHash, index),
  setVolume: (vol) => controllers.playback().setVolume(vol),
  openPath: (infoHash, index) => controllers.playback().openPath(infoHash, index),
  // Subtitles
-  openSubtitles: () => controllers.subtitles().openSubtitles(),
+  'openSubtitles': () => controllers.subtitles().openSubtitles(),
-  selectSubtitle: (index) => controllers.subtitles().selectSubtitle(index),
+  'selectSubtitle': (index) => controllers.subtitles().selectSubtitle(index),
-  toggleSubtitlesMenu: () => controllers.subtitles().toggleSubtitlesMenu(),
+  'toggleSubtitlesMenu': () => controllers.subtitles().toggleSubtitlesMenu(),
-  checkForSubtitles: () => controllers.subtitles().checkForSubtitles(),
+  'checkForSubtitles': () => controllers.subtitles().checkForSubtitles(),
-  addSubtitles: (files, autoSelect) => controllers.subtitles().addSubtitles(files, autoSelect),
+  'addSubtitles': (files, autoSelect) => controllers.subtitles().addSubtitles(files, autoSelect),
  // Audio Tracks
  selectAudioTrack: (index) => controllers.audioTracks().selectAudioTrack(index),
  toggleAudioTracksMenu: () => controllers.audioTracks().toggleAudioTracksMenu(),
  // Local media: <video>, <audio>, external players
-  mediaStalled: () => controllers.media().mediaStalled(),
+  'mediaStalled': () => controllers.media().mediaStalled(),
-  mediaError: (err) => controllers.media().mediaError(err),
+  'mediaError': (err) => controllers.media().mediaError(err),
-  mediaSuccess: () => controllers.media().mediaSuccess(),
+  'mediaSuccess': () => controllers.media().mediaSuccess(),
-  mediaTimeUpdate: () => controllers.media().mediaTimeUpdate(),
+  'mediaTimeUpdate': () => controllers.media().mediaTimeUpdate(),
-  mediaMouseMoved: () => controllers.media().mediaMouseMoved(),
+  'mediaMouseMoved': () => controllers.media().mediaMouseMoved(),
-  mediaControlsMouseEnter: () => controllers.media().controlsMouseEnter(),
+  'mediaControlsMouseEnter': () => controllers.media().controlsMouseEnter(),
-  mediaControlsMouseLeave: () => controllers.media().controlsMouseLeave(),
+  'mediaControlsMouseLeave': () => controllers.media().controlsMouseLeave(),
-  openExternalPlayer: () => controllers.media().openExternalPlayer(),
+  'openExternalPlayer': () => controllers.media().openExternalPlayer(),
-  externalPlayerNotFound: () => controllers.media().externalPlayerNotFound(),
+  'externalPlayerNotFound': () => controllers.media().externalPlayerNotFound(),
  // Remote casting: Chromecast, Airplay, etc
-  toggleCastMenu: (deviceType) => lazyLoadCast().toggleMenu(deviceType),
+  'toggleCastMenu': (deviceType) => lazyLoadCast().toggleMenu(deviceType),
-  selectCastDevice: (index) => lazyLoadCast().selectDevice(index),
+  'selectCastDevice': (index) => lazyLoadCast().selectDevice(index),
-  stopCasting: () => lazyLoadCast().stop(),
+  'stopCasting': () => lazyLoadCast().stop(),
  // Preferences screen
-  preferences: () => controllers.prefs().show(),
+  'preferences': () => controllers.prefs().show(),
-  updatePreferences: (key, value) => controllers.prefs().update(key, value),
+  'updatePreferences': (key, value) => controllers.prefs().update(key, value),
-  checkDownloadPath,
+  'checkDownloadPath': checkDownloadPath,
-  updateGlobalTrackers: (trackers) => setGlobalTrackers(trackers),
+  'startFolderWatcher': () => controllers.folderWatcher().start(),
-  startFolderWatcher: () => controllers.folderWatcher().start(),
+  'stopFolderWatcher': () => controllers.folderWatcher().stop(),
  stopFolderWatcher: () => controllers.folderWatcher().stop(),
  // Update (check for new versions on Linux, where there's no auto updater)
-  updateAvailable: (version) => controllers.update().updateAvailable(version),
+  'updateAvailable': (version) => controllers.update().updateAvailable(version),
-  skipVersion: (version) => controllers.update().skipVersion(version),
+  'skipVersion': (version) => controllers.update().skipVersion(version),
  // Navigation between screens (back, forward, ESC, etc)
-  exitModal: () => { state.modal = null },
+  'exitModal': () => { state.modal = null },
-  backToList,
+  'backToList': backToList,
-  escapeBack,
+  'escapeBack': escapeBack,
-  back: () => state.location.back(),
+  'back': () => state.location.back(),
-  forward: () => state.location.forward(),
+  'forward': () => state.location.forward(),
-  cancel: () => state.location.cancel(),
+  'cancel': () => state.location.cancel(),
  // Controlling the window
-  setDimensions,
+  'setDimensions': setDimensions,
-  toggleFullScreen: (setTo) => ipcRenderer.send('toggleFullScreen', setTo),
+  'toggleFullScreen': (setTo) => ipcRenderer.send('toggleFullScreen', setTo),
-  setTitle: (title) => { state.window.title = title },
+  'setTitle': (title) => { state.window.title = title },
-  resetTitle: () => { state.window.title = config.APP_WINDOW_TITLE },
+  'resetTitle': () => { state.window.title = config.APP_WINDOW_TITLE },
  // Everything else
-  onOpen,
+  'onOpen': onOpen,
-  error: onError,
+  'error': onError,
-  uncaughtError: (proc, err) => telemetry.logUncaughtError(proc, err),
+  'uncaughtError': (proc, err) => telemetry.logUncaughtError(proc, err),
-  stateSave: () => State.save(state),
+  'stateSave': () => State.save(state),
-  stateSaveImmediate: () => State.saveImmediate(state),
+  'stateSaveImmediate': () => State.saveImmediate(state),
-  update: () => {} // No-op, just trigger an update
+  'update': () => {} // No-op, just trigger an update
 }
 // Events from the UI never modify state directly. Instead they call dispatch()
@@ -377,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())
@@ -402,7 +384,7 @@ function setupIpc () {
 function backToList () {
  // Exit any modals and screens with a back button
  state.modal = null
-  state.location.backToFirst(() => {
+  state.location.backToFirst(function () {
    // If we were already on the torrent list, scroll to the top
    const contentTag = document.querySelector('.content')
    if (contentTag) contentTag.scrollTop = 0
@@ -420,10 +402,6 @@ function escapeBack () {
  }
 }
 function setGlobalTrackers () {
  controllers.torrentList().setGlobalTrackers(state.getGlobalTrackers())
 }
 // Starts all torrents that aren't paused on program startup
 function resumeTorrents () {
  state.saved.torrents
@@ -479,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
@@ -526,39 +504,8 @@ function onError (err) {
 const editableHtmlTags = new Set(['input', 'textarea'])
 function onPaste (e) {
  if (e && editableHtmlTags.has(e.target.tagName.toLowerCase())) return
  controllers.torrentList().addTorrent(electron.clipboard.readText())
  update()
 }
 function onKeydown (e) {
  // prevent event fire on user input elements
  if (editableHtmlTags.has(e.target.tagName.toLowerCase())) return
-
+  controllers.torrentList().addTorrent(electron.clipboard.readText())
  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()
 }
@@ -575,7 +522,7 @@ function onBlur () {
 }
 function onVisibilityChange () {
-  state.window.isVisible = !document.hidden
+  state.window.isVisible = !document.webkitHidden
 }
 function onFullscreenChanged (e, isFullScreen) {
@@ -596,7 +543,7 @@ function onWindowBoundsChanged (e, newBounds) {
 }
 function checkDownloadPath () {
-  fs.stat(state.saved.prefs.downloadPath, (err, stat) => {
+  fs.stat(state.saved.prefs.downloadPath, function (err, stat) {
    if (err) {
      state.downloadPathStatus = 'missing'
      return console.error(err)
--- 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),
+  'home': createGetter(() => TorrentListPage),
-  player: createGetter(() => require('./player-page')),
+  'player': createGetter(() => require('./player-page')),
  'create-torrent': createGetter(() => require('./create-torrent-page')),
-  preferences: createGetter(() => require('./preferences-page'))
+  'preferences': createGetter(() => require('./preferences-page'))
 }
 const Modals = {
@@ -24,9 +24,7 @@ const Modals = {
  ),
  'remove-torrent-modal': createGetter(() => require('../components/remove-torrent-modal')),
  'update-available-modal': createGetter(() => require('../components/update-available-modal')),
-  'unsupported-media-modal': createGetter(() => require('../components/unsupported-media-modal')),
+  'unsupported-media-modal': createGetter(() => require('../components/unsupported-media-modal'))
  'delete-all-torrents-modal':
      createGetter(() => require('../components/delete-all-torrents-modal'))
 }
 const fontFamily = process.platform === 'win32'
@@ -86,12 +84,12 @@ class App extends React.Component {
    const recentErrors = state.errors.filter((x) => now - x.time < 5000)
    const hasErrors = recentErrors.length > 0
-    const errorElems = recentErrors.map((error, i) => <div key={i} className='error'>{error.message}</div>)
+    const errorElems = recentErrors.map(function (error, i) {
      return (<div key={i} className='error'>{error.message}</div>)
    })
    return (
-      <div
+      <div key='errors'
-        key='errors'
+        className={'error-popover ' + (hasErrors ? 'visible' : 'hidden')}>
        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.setIsPrivate = (_, isPrivate) => this.setState({ isPrivate })
-    this.handleSetComment = (_, comment) => this.setState({ comment })
+    this.setComment = (_, comment) => this.setState({ comment })
-    this.handleSetTrackers = (_, trackers) => this.setState({ trackers })
+    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,14 +1,12 @@
 /* globals MediaMetadata */
 const React = require('react')
-const BitField = require('bitfield').default
+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')
 const { dispatch, dispatcher } = require('../lib/dispatcher')
 const config = require('../../config')
 const { calculateEta } = require('../lib/time')
 // Shows a streaming video player. Standard features + Chromecast + Airplay
 module.exports = class Player extends React.Component {
@@ -22,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>
@@ -37,7 +34,6 @@ module.exports = class Player extends React.Component {
    tag.pause()
    tag.src = ''
    tag.load()
    navigator.mediaSession.metadata = null
  }
 }
@@ -54,28 +50,6 @@ function renderMedia (state) {
  // Get the <video> or <audio> tag
  const mediaElement = document.querySelector(state.playing.type)
  if (mediaElement !== null) {
    if (navigator.mediaSession.metadata === null && mediaElement.played.length !== 0) {
      navigator.mediaSession.metadata = new MediaMetadata({
        title: state.playing.fileName
      })
      navigator.mediaSession.setActionHandler('pause', () => {
        dispatch('playPause')
      })
      navigator.mediaSession.setActionHandler('play', () => {
        dispatch('playPause')
      })
      if (Playlist.hasNext(state)) {
        navigator.mediaSession.setActionHandler('nexttrack', () => {
          dispatch('nextTrack')
        })
      }
      if (Playlist.hasPrevious(state)) {
        navigator.mediaSession.setActionHandler('previoustrack', () => {
          dispatch('previousTrack')
        })
      }
    }
    if (state.playing.isPaused && !mediaElement.paused) {
      mediaElement.pause()
    } else if (!state.playing.isPaused && mediaElement.paused) {
@@ -121,31 +95,24 @@ function renderMedia (state) {
      delete file.selectedSubtitle
    }
    // Switch to selected audio track
    const audioTracks = mediaElement.audioTracks || []
    for (let j = 0; j < audioTracks.length; j++) {
      const isSelectedTrack = j === state.playing.audioTracks.selectedIndex
      audioTracks[j].enabled = isSelectedTrack
    }
    state.playing.volume = mediaElement.volume
  }
  // Add subtitles to the <video> tag
  const trackTags = []
  if (state.playing.subtitles.selectedIndex >= 0) {
-    state.playing.subtitles.tracks.forEach((track, i) => {
+    for (let i = 0; i < state.playing.subtitles.tracks.length; i++) {
      const track = state.playing.subtitles.tracks[i]
      const isSelected = state.playing.subtitles.selectedIndex === i
      trackTags.push(
        <track
          key={i}
-          default={isSelected}
+          default={isSelected ? 'default' : ''}
          label={track.label}
-          kind='subtitles'
+          type='subtitles'
-          src={track.buffer}
+          src={track.buffer} />
        />
      )
-    })
+    }
  }
  // Create the <audio> or <video> tag
@@ -154,14 +121,13 @@ function renderMedia (state) {
    <MediaTagName
      src={Playlist.getCurrentLocalURL(state)}
      onDoubleClick={dispatcher('toggleFullScreen')}
      onClick={dispatcher('playPause')}
      onLoadedMetadata={onLoadedMetadata}
      onEnded={onEnded}
      onStalled={dispatcher('mediaStalled')}
      onError={dispatcher('mediaError')}
      onTimeUpdate={dispatcher('mediaTimeUpdate')}
      onEncrypted={dispatcher('mediaEncrypted')}
-    >
+      onCanPlay={onCanPlay}>
      {trackTags}
    </MediaTagName>
  )
@@ -171,60 +137,24 @@ function renderMedia (state) {
    <div
      key='letterbox'
      className='letterbox'
-      onMouseMove={dispatcher('mediaMouseMoved')}
+      onMouseMove={dispatcher('mediaMouseMoved')}>
    >
      {mediaTag}
      {renderOverlay(state)}
    </div>
  )
  // As soon as we know the video dimensions, resize the window
  function onLoadedMetadata (e) {
-    const mediaElement = e.target
+    if (state.playing.type !== 'video') return
-
+    const video = e.target
-    // check if we can decode video and audio track
+    const dimensions = {
-    if (state.playing.type === 'video') {
+      width: video.videoWidth,
-      if (mediaElement.videoTracks.length === 0) {
+      height: video.videoHeight
        dispatch('mediaError', 'Video codec unsupported')
      }
      if (mediaElement.audioTracks.length === 0) {
        dispatch('mediaError', 'Audio codec unsupported')
      }
      dispatch('mediaSuccess')
      const dimensions = {
        width: mediaElement.videoWidth,
        height: mediaElement.videoHeight
      }
      // As soon as we know the video dimensions, resize the window
      dispatch('setDimensions', dimensions)
      // set audioTracks
      const tracks = []
      for (let i = 0; i < mediaElement.audioTracks.length; i++) {
        tracks.push({
          label: mediaElement.audioTracks[i].label || `Track ${i + 1}`,
          language: mediaElement.audioTracks[i].language
        })
      }
      state.playing.audioTracks.tracks = tracks
      state.playing.audioTracks.selectedIndex = 0
    }
    // check if we can decode audio track
    if (state.playing.type === 'audio') {
      if (mediaElement.audioTracks.length === 0) {
        dispatch('mediaError', 'Audio codec unsupported')
      }
      dispatch('mediaSuccess')
    }
    dispatch('setDimensions', dimensions)
  }
-  function onEnded () {
+  function onEnded (e) {
    if (Playlist.hasNext(state)) {
      dispatch('nextTrack')
    } else {
@@ -233,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) {
@@ -350,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>
    ))
  }
@@ -358,26 +301,22 @@ function renderAudioMetadata (state) {
  // Audio metadata: format
  const format = []
  fileSummary.audioInfo.format = fileSummary.audioInfo.format || ''
-  if (fileSummary.audioInfo.format.container) {
+  if (fileSummary.audioInfo.format.dataformat) {
-    format.push(fileSummary.audioInfo.format.container)
+    format.push(fileSummary.audioInfo.format.dataformat)
  }
  if (fileSummary.audioInfo.format.codec &&
    fileSummary.audioInfo.format.container !== fileSummary.audioInfo.format.codec) {
    format.push(fileSummary.audioInfo.format.codec)
  }
  if (fileSummary.audioInfo.format.bitrate) {
-    format.push(Math.round(fileSummary.audioInfo.format.bitrate / 1000) + ' kbit/s') // 128 kbit/s
+    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')
+    format.push(fileSummary.audioInfo.format.bitsPerSample + ' bit')
  }
  if (format.length > 0) {
    elems.push((
      <div key='format' className='audio-format'>
-        <label>Format</label>{format.join(', ')}
+        <label>Format</label>{ format.join(', ') }
      </div>
    ))
  }
@@ -419,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>
@@ -453,70 +392,22 @@ function renderCastScreen (state) {
  const isStarting = state.playing.location.endsWith('-pending')
  const castName = state.playing.castName
  const fileName = state.getPlayingFileSummary().name || ''
  let castStatus
  if (isCast && isStarting) castStatus = 'Connecting to ' + castName + '...'
  else if (isCast && !isStarting) castStatus = 'Connected to ' + castName
  else castStatus = ''
  const prog = state.getPlayingTorrentSummary().progress || {}
  // Show a nice title image, if possible
  const style = {
    backgroundImage: cssBackgroundImagePoster(state)
  }
  function renderEta (total, downloaded) {
    const missing = (total || 0) - (downloaded || 0)
    const downloadSpeed = prog.downloadSpeed || 0
    if (downloadSpeed === 0 || missing === 0) return
    const etaStr = calculateEta(missing, downloadSpeed)
    return (<span>{etaStr}</span>)
  }
  function renderDownloadProgress () {
    if (!prog.files) return
    const fileProg = prog.files[state.playing.fileIndex]
    const fileProgress = fileProg.numPiecesPresent / fileProg.numPieces
    const fileLength = state.getPlayingFileSummary().length
    const fileDownloaded = fileProgress * fileLength
    const progress = Math.round(100 * fileProgress)
    const total = prettyBytes(fileLength)
    const completed = prettyBytes(fileDownloaded)
    const downloadSpeed = prettyBytes(prog.downloadSpeed || 0)
    const uploadSpeed = prettyBytes(prog.uploadSpeed || 0)
    let sizes
    if (fileProgress < 1) {
      sizes = <span> | {completed} / {total}</span>
    } else {
      sizes = <span> | {completed}</span>
    }
    return (
      <div key='download-progress'>
        <span className='progress'>{progress}% downloaded {sizes}</span>
        <br />
        <span>↓ {downloadSpeed}/s ↑ {uploadSpeed}/s | {prog.numPeers || 0} peer(s)</span>
        <br />
        {renderEta(fileLength, fileDownloaded)}
      </div>
    )
  }
  return (
    <div key='cast' className='letterbox' style={style}>
      <div className='cast-screen'>
        <i className='icon'>{castIcon}</i>
        <div key='type' className='cast-type'>{castType}</div>
        <div key='status' className='cast-status'>{castStatus}</div>
        <div key='name' className='name'>{fileName}</div>
        {renderDownloadProgress()}
      </div>
    </div>
  )
@@ -528,13 +419,12 @@ function renderCastOptions (state) {
  const { location, devices } = state.devices.castMenu
  const player = state.devices[location]
-  const items = devices.map((device, ix) => {
+  const items = devices.map(function (device, ix) {
    const isSelected = player.device === device
    const name = device.name
    return (
      <li key={ix} onClick={dispatcher('selectCastDevice', ix)}>
        <i className='icon'>{isSelected ? 'radio_button_checked' : 'radio_button_unchecked'}</i>
        {' '}
        {name}
      </li>
    )
@@ -551,7 +441,7 @@ function renderSubtitleOptions (state) {
  const subtitles = state.playing.subtitles
  if (!subtitles.tracks.length || !subtitles.showMenu) return
-  const items = subtitles.tracks.map((track, ix) => {
+  const items = subtitles.tracks.map(function (track, ix) {
    const isSelected = state.playing.subtitles.selectedIndex === ix
    return (
      <li key={ix} onClick={dispatcher('selectSubtitle', ix)}>
@@ -574,27 +464,6 @@ function renderSubtitleOptions (state) {
  )
 }
 function renderAudioTrackOptions (state) {
  const audioTracks = state.playing.audioTracks
  if (!audioTracks.tracks.length || !audioTracks.showMenu) return
  const items = audioTracks.tracks.map((track, ix) => {
    const isSelected = state.playing.audioTracks.selectedIndex === ix
    return (
      <li key={ix} onClick={dispatcher('selectAudioTrack', ix)}>
        <i className='icon'>{'radio_button_' + (isSelected ? 'checked' : 'unchecked')}</i>
        {track.label}
      </li>
    )
  })
  return (
    <ul key='audio-track-options' className='options-list'>
      {items}
    </ul>
  )
 }
 function renderPlayerControls (state) {
  const positionPercent = 100 * state.playing.currentTime / state.playing.duration
  const playbackCursorStyle = { left: 'calc(' + positionPercent + '% - 3px)' }
@@ -603,71 +472,50 @@ function renderPlayerControls (state) {
    : state.playing.subtitles.selectedIndex >= 0
      ? 'active'
      : ''
  const multiAudioClass = state.playing.audioTracks.tracks.length > 1
    ? 'active'
    : 'disabled'
  const prevClass = Playlist.hasPrevious(state) ? '' : 'disabled'
  const nextClass = Playlist.hasNext(state) ? '' : 'disabled'
  const elements = [
    renderPreview(state),
    <div key='playback-bar' className='playback-bar'>
      {renderLoadingBar(state)}
      <div
        key='cursor'
        className='playback-cursor'
-        style={playbackCursorStyle}
+        style={playbackCursorStyle} />
      />
      <div
        key='scrub-bar'
        className='scrub-bar'
        draggable='true'
        onMouseMove={handleScrubPreview}
        onMouseOut={clearPreview}
        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')}>
      role='button'
      aria-label='Previous track'
    >
      skip_previous
    </i>,
    <i
      key='play'
      className='icon play-pause float-left'
-      onClick={dispatcher('playPause')}
+      onClick={dispatcher('playPause')}>
      role='button'
      aria-label={state.playing.isPaused ? 'Play' : 'Pause'}
    >
      {state.playing.isPaused ? 'play_arrow' : 'pause'}
    </i>,
    <i
      key='skip-next'
      className={'icon skip-next float-left ' + nextClass}
-      onClick={dispatcher('nextTrack')}
+      onClick={dispatcher('nextTrack')}>
      role='button'
      aria-label='Next track'
    >
      skip_next
    </i>,
    <i
      key='fullscreen'
      className='icon fullscreen float-right'
-      onClick={dispatcher('toggleFullScreen')}
+      onClick={dispatcher('toggleFullScreen')}>
      role='button'
      aria-label={state.window.isFullScreen ? 'Exit full screen' : 'Enter full screen'}
    >
      {state.window.isFullScreen ? 'fullscreen_exit' : 'fullscreen'}
    </i>
  ]
@@ -678,20 +526,9 @@ function renderPlayerControls (state) {
      <i
        key='subtitles'
        className={'icon closed-caption float-right ' + captionsClass}
-        onClick={handleSubtitles}
+        onClick={handleSubtitles}>
        role='button'
        aria-label='Closed captions'
      >
        closed_caption
      </i>
    ), (
      <i
        key='audio-tracks'
        className={'icon multi-audio float-right ' + multiAudioClass}
        onClick={handleAudioTracks}
      >
        library_music
      </i>
    ))
  }
@@ -702,11 +539,11 @@ function renderPlayerControls (state) {
  // Add the cast buttons. Icons for each cast type, connected/disconnected:
  const buttonIcons = {
-    chromecast: { true: 'cast_connected', false: 'cast' },
+    'chromecast': { true: 'cast_connected', false: 'cast' },
-    airplay: { true: 'airplay', false: 'airplay' },
+    'airplay': { true: 'airplay', false: 'airplay' },
-    dlna: { true: 'tv', false: 'tv' }
+    'dlna': { true: 'tv', false: 'tv' }
  }
-  castTypes.forEach(castType => {
+  castTypes.forEach(function (castType) {
    // Do we show this button (eg. the Chromecast button) at all?
    const isCasting = state.playing.location.startsWith(castType)
    const player = state.devices[castType]
@@ -733,8 +570,7 @@ function renderPlayerControls (state) {
      <i
        key={castType}
        className={'icon device float-right ' + buttonClass}
-        onClick={buttonHandler}
+        onClick={buttonHandler}>
      >
        {buttonIcon}
      </i>
    ))
@@ -743,14 +579,10 @@ function renderPlayerControls (state) {
  // Render volume slider
  const volume = state.playing.volume
  const volumeIcon = 'volume_' + (
-    volume === 0
+    volume === 0 ? 'off'
-      ? 'off'
+      : volume < 0.3 ? 'mute'
-      : volume < 0.3
+        : volume < 0.6 ? 'down'
-        ? 'mute'
+          : 'up')
        : volume < 0.6
          ? 'down'
          : 'up'
  )
  const volumeStyle = {
    background: '-webkit-gradient(linear, left top, right top, ' +
      'color-stop(' + (volume * 100) + '%, #eee), ' +
@@ -761,10 +593,7 @@ function renderPlayerControls (state) {
    <div key='volume' className='volume float-left'>
      <i
        className='icon volume-icon float-left'
-        onMouseDown={handleVolumeMute}
+        onMouseDown={handleVolumeMute}>
        role='button'
        aria-label='Mute'
      >
        {volumeIcon}
      </i>
      <input
@@ -772,8 +601,7 @@ function renderPlayerControls (state) {
        type='range' min='0' max='1' step='0.05'
        value={volume}
        onChange={handleVolumeScrub}
-        style={volumeStyle}
+        style={volumeStyle} />
      />
    </div>
  ))
@@ -795,31 +623,24 @@ function renderPlayerControls (state) {
    ))
  }
-  const emptyImage = new window.Image(0, 0)
+  return (
-  emptyImage.src = 'data:image/gif;base64,R0lGODlhAQABAAD/ACwAAAAAAQABAAACADs%3D'
+    <div key='controls' className='controls'
      onMouseEnter={dispatcher('mediaControlsMouseEnter')}
      onMouseLeave={dispatcher('mediaControlsMouseLeave')}>
      {elements}
      {renderCastOptions(state)}
      {renderSubtitleOptions(state)}
    </div>
  )
  function handleDragStart (e) {
    // Prevent the cursor from changing, eg to a green + icon on Mac
    if (e.dataTransfer) {
      const dt = e.dataTransfer
      // Prevent the cursor from changing, eg to a green + icon on Mac
      dt.effectAllowed = 'none'
      // Prevent ghost image
      dt.setDragImage(emptyImage, 0, 0)
    }
  }
  // Handles a scrub hover (preview another position in the video)
  function handleScrubPreview (e) {
    // Only show for videos
    if (!e.clientX || state.playing.type !== 'video') return
    dispatch('mediaMouseMoved')
    dispatch('preview', e.clientX)
  }
  function clearPreview () {
    if (state.playing.type !== 'video') return
    dispatch('clearPreview')
  }
  // Handles a click or drag to scrub (jump to another position in the video)
  function handleScrub (e) {
    if (!e.clientX) return
@@ -831,7 +652,7 @@ function renderPlayerControls (state) {
  }
  // Handles volume muting and Unmuting
-  function handleVolumeMute () {
+  function handleVolumeMute (e) {
    if (state.playing.volume === 0.0) {
      dispatch('setVolume', 1.0)
    } else {
@@ -852,73 +673,6 @@ function renderPlayerControls (state) {
      dispatch('toggleSubtitlesMenu')
    }
  }
  function handleAudioTracks () {
    dispatch('toggleAudioTracksMenu')
  }
  return (
    <div
      key='controls' className='controls'
      onMouseEnter={dispatcher('mediaControlsMouseEnter')}
      onMouseLeave={dispatcher('mediaControlsMouseLeave')}
    >
      {elements}
      {renderCastOptions(state)}
      {renderSubtitleOptions(state)}
      {renderAudioTrackOptions(state)}
    </div>
  )
 }
 function renderPreview (state) {
  const { previewXCoord = null } = state.playing
  // Calculate time from x-coord as fraction of track width
  const windowWidth = document.querySelector('body').clientWidth
  const fraction = previewXCoord / windowWidth
  const time = fraction * state.playing.duration /* seconds */
  const height = 70
  let width = 0
  const previewEl = document.querySelector('video#preview')
  if (previewEl !== null && previewXCoord !== null) {
    previewEl.currentTime = time
    // Auto adjust width to maintain video aspect ratio
    width = Math.floor((previewEl.videoWidth / previewEl.videoHeight) * height)
  }
  // Center preview window on mouse cursor,
  // while avoiding falling off the left or right edges
  const xPos = Math.min(Math.max(previewXCoord - (width / 2), 5), windowWidth - width - 5)
  return (
    <div
      key='preview' style={{
        position: 'absolute',
        bottom: 50,
        left: xPos,
        display: previewXCoord == null && 'none' // Hide preview when XCoord unset
      }}
    >
      <div style={{ width, height, backgroundColor: 'black' }}>
        <video
          src={Playlist.getCurrentLocalURL(state)}
          id='preview'
          style={{ border: '1px solid lightgrey', borderRadius: 2 }}
        />
      </div>
      <p
        style={{
          textAlign: 'center', margin: 5, textShadow: '0 0 2px rgba(0,0,0,.5)', color: '#eee'
        }}
      >
        {formatTime(time, state.playing.duration)}
      </p>
    </div>
  )
 }
 // Renders the loading bar. Shows which parts of the torrent are loaded, which
@@ -940,7 +694,7 @@ function renderLoadingBar (state) {
  const parts = []
  let lastPiecePresent = false
  for (let i = fileProg.startPiece; i <= fileProg.endPiece; i++) {
-    const partPresent = BitField.prototype.get.call(prog.bitfield, i)
+    const partPresent = Bitfield.prototype.get.call(prog.bitfield, i)
    if (partPresent && !lastPiecePresent) {
      parts.push({ start: i - fileProg.startPiece, count: 1 })
    } else if (partPresent) {
@@ -950,7 +704,7 @@ function renderLoadingBar (state) {
  }
  // Output some bars to show which parts of the file are loaded
-  const loadingBarElems = parts.map((part, i) => {
+  const loadingBarElems = parts.map(function (part, i) {
    const style = {
      left: (100 * part.start / fileProg.numPieces) + '%',
      width: (100 * part.count / fileProg.numPieces) + '%'
@@ -980,14 +734,14 @@ function formatTime (time, total) {
    return '0:00'
  }
-  const totalHours = Math.floor(total / 3600)
+  let totalHours = Math.floor(total / 3600)
-  const totalMinutes = Math.floor(total / 60)
+  let totalMinutes = Math.floor(total % 3600 / 60)
-  const hours = Math.floor(time / 3600)
+  let hours = Math.floor(time / 3600)
  let minutes = Math.floor(time % 3600 / 60)
-  if (totalMinutes > 9 && minutes < 10) {
+  if (totalMinutes > 9) {
-    minutes = '0' + minutes
+    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,10 +1,9 @@
 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
 const RaisedButton = require('material-ui/RaisedButton').default
 const TextField = require('material-ui/TextField').default
 const Heading = require('../components/heading')
 const PathSelector = require('../components/path-selector')
@@ -26,18 +25,6 @@ class PreferencesPage extends React.Component {
    this.handleStartupChange =
      this.handleStartupChange.bind(this)
    this.handleSoundNotificationsChange =
      this.handleSoundNotificationsChange.bind(this)
    this.handleSetGlobalTrackers =
      this.handleSetGlobalTrackers.bind(this)
    const globalTrackers = this.props.state.getGlobalTrackers().join('\n')
    this.state = {
      globalTrackers
    }
  }
  downloadPathSelector () {
@@ -46,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>
    )
  }
@@ -66,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'
+          label={'Play torrent media files using WebTorrent'}
-          onCheck={this.handleOpenExternalPlayerChange}
+          onCheck={this.handleOpenExternalPlayerChange} />
        />
      </Preference>
    )
  }
@@ -83,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>
@@ -109,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>
    )
  }
@@ -129,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>
@@ -147,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 () {
@@ -162,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)
  }
@@ -191,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>
    )
  }
@@ -201,77 +185,29 @@ class PreferencesPage extends React.Component {
    dispatch('updatePreferences', 'startup', isChecked)
  }
-  setStartupCheckbox () {
+  setStartupSection () {
    if (config.IS_PORTABLE) {
      return
    }
    return (
-      <Preference>
+      <PreferencesSection title='Startup'>
-        <Checkbox
+        <Preference>
-          className='control'
+          <Checkbox
-          checked={this.props.state.saved.prefs.startup}
+            className='control'
-          label='Open WebTorrent on startup'
+            checked={this.props.state.saved.prefs.startup}
-          onCheck={this.handleStartupChange}
+            label={'Open WebTorrent on startup.'}
-        />
+            onCheck={this.handleStartupChange}
-      </Preference>
+          />
        </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)
  }
  setGlobalTrackers () {
    // Align the text fields
    const textFieldStyle = { width: '100%' }
    const textareaStyle = { margin: 0 }
    return (
      <Preference>
        <TextField
          className='torrent-trackers control'
          style={textFieldStyle}
          textareaStyle={textareaStyle}
          multiLine
          rows={2}
          rowsMax={10}
          value={this.state.globalTrackers}
          onChange={this.handleSetGlobalTrackers}
        />
      </Preference>
    )
  }
  handleSetGlobalTrackers (e, globalTrackers) {
    this.setState({ globalTrackers })
    const announceList = globalTrackers
      .split('\n')
      .map((s) => s.trim())
      .filter((s) => s !== '')
    dispatch('updatePreferences', 'globalTrackers', announceList)
    dispatch('updateGlobalTrackers', announceList)
  }
  render () {
    const style = {
      color: colors.grey400,
@@ -293,13 +229,7 @@ class PreferencesPage extends React.Component {
        <PreferencesSection title='Default torrent app'>
          {this.setDefaultAppButton()}
        </PreferencesSection>
-        <PreferencesSection title='General'>
+        {this.setStartupSection()}
          {this.setStartupCheckbox()}
          {this.soundNotificationsCheckbox()}
        </PreferencesSection>
        <PreferencesSection title='Trackers'>
          {this.setGlobalTrackers()}
        </PreferencesSection>
      </div>
    )
  }
@@ -308,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,8 +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')
 const { calculateEta } = require('../lib/time')
 module.exports = class TorrentList extends React.Component {
  render () {
@@ -36,11 +35,7 @@ module.exports = class TorrentList extends React.Component {
    )
    return (
-      <div
+      <div key='torrent-list' className='torrent-list'>
        key='torrent-list'
        className='torrent-list'
        onContextMenu={dispatcher('openTorrentListContextMenu')}
      >
        {contents}
      </div>
    )
@@ -72,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}
@@ -136,8 +130,7 @@ module.exports = class TorrentList extends React.Component {
          }}
          checked={isActive}
          onClick={stopPropagation}
-          onCheck={dispatcher('toggleTorrent', infoHash)}
+          onCheck={dispatcher('toggleTorrent', infoHash)} />
        />
      )
    }
@@ -154,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>
      )
@@ -196,9 +189,18 @@ module.exports = class TorrentList extends React.Component {
      const downloadSpeed = prog.downloadSpeed
      if (downloadSpeed === 0 || missing === 0) return
-      const etaStr = calculateEta(missing, downloadSpeed)
+      const rawEta = missing / downloadSpeed
      const hours = Math.floor(rawEta / 3600) % 24
      const minutes = Math.floor(rawEta / 60) % 60
      const seconds = Math.floor(rawEta % 60)
-      return (<span key='eta'>{etaStr}</span>)
+      // Only display hours and minutes if they are greater than 0 but always
      // display minutes if hours is being displayed
      const hoursStr = hours ? hours + 'h' : ''
      const minutesStr = (hours || minutes) ? minutes + 'm' : ''
      const secondsStr = seconds + 's'
      return (<span>{hoursStr} {minutesStr} {secondsStr} remaining</span>)
    }
    function renderTorrentStatus () {
@@ -208,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 = ''
+        status = 'Downloading'
        else if (!torrentSummary.progress.ready) status = 'Verifying'
        else status = 'Downloading'
      } else if (torrentSummary.status === 'seeding') {
        status = 'Seeding'
      } else { // torrentSummary.status is 'new' or something unexpected
@@ -232,9 +232,8 @@ module.exports = class TorrentList extends React.Component {
        <i
          key='play-button'
          title='Start streaming'
-          className='icon play'
+          className={'icon play'}
-          onClick={dispatcher('playFile', infoHash)}
+          onClick={dispatcher('playFile', infoHash)}>
        >
          play_circle_outline
        </i>
      )
@@ -247,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>
@@ -280,17 +278,10 @@ module.exports = class TorrentList extends React.Component {
      )
    } else {
      // We do know the files. List them and show download stats for each one
-      const sortByName = this.props.state.saved.prefs.sortByName
+      const fileRows = torrentSummary.files
      const collator = new Intl.Collator(undefined, { numeric: true, sensitivity: 'base' })
      let fileRows = torrentSummary.files
        .filter((file) => !file.path.includes('/.____padding_file/'))
        .map((file, index) => ({ file, index }))
-
+        .map((object) => this.renderFileRow(torrentSummary, object.file, object.index))
      if (sortByName) {
        fileRows = fileRows.sort((a, b) => collator.compare(a.file.name, b.file.name))
      }
      fileRows = fileRows.map((obj) => this.renderFileRow(torrentSummary, obj.file, obj.index))
      filesElement = (
        <div key='files' className='files'>
@@ -321,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
@@ -342,7 +333,7 @@ module.exports = class TorrentList extends React.Component {
    } else {
      icon = 'description' /* file icon, opens in OS default app */
      handleClick = isDone
-        ? dispatcher('openPath', infoHash, index)
+        ? dispatcher('openItem', infoHash, index)
        : (e) => e.stopPropagation() // noop if file is not ready
    }
    // TODO: add a css 'disabled' class to indicate that a file cannot be opened/streamed
@@ -364,10 +355,8 @@ module.exports = class TorrentList extends React.Component {
        <td className={'col-size ' + rowClass}>
          {prettyBytes(file.length)}
        </td>
-        <td
+        <td className='col-select'
-          className='col-select'
+          onClick={dispatcher('toggleTorrentFile', infoHash, index)}>
          onClick={dispatcher('toggleTorrentFile', infoHash, index)}
        >
          <i className='icon deselect-file'>{isSelected ? 'close' : 'add'}</i>
        </td>
      </tr>
@@ -381,16 +370,16 @@ module.exports = class TorrentList extends React.Component {
    return (
      <div key='radial-progress' className={'radial-progress ' + cssClass}>
-        <div className='circle'>
+        <div key='circle' className='circle'>
-          <div className='mask full' style={transformFill}>
+          <div key='mask-full' className='mask full' style={transformFill}>
-            <div className='fill' style={transformFill} />
+            <div key='fill' className='fill' style={transformFill} />
          </div>
-          <div className='mask half'>
+          <div key='mask-half' className='mask half'>
-            <div className='fill' style={transformFill} />
+            <div key='fill' className='fill' style={transformFill} />
-            <div className='fill fix' style={transformFix} />
+            <div key='fill-fix' className='fill fix' style={transformFix} />
          </div>
        </div>
-        <div className='inset' />
+        <div key='inset' className='inset' />
      </div>
    )
  }
@@ -404,11 +393,21 @@ function getErrorMessage (torrentSummary) {
  const err = torrentSummary.error
  if (err === 'path-missing') {
    return (
-      <span key='path-missing'>
+      <span>
-        Path missing.<br />
+        Torrent data missing.<br />
-        Fix and restart the app, or delete the torrent.
+        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
@@ -3,18 +3,33 @@
 console.time('init')
 const crypto = require('crypto')
-const util = require('util')
+const deepEqual = require('deep-equal')
-const { ipcRenderer } = require('electron')
+const defaultAnnounceList = require('create-torrent').announceList
 const electron = require('electron')
 const fs = require('fs')
 const mkdirp = require('mkdirp')
 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')
 const { TorrentKeyNotFoundError } = require('./lib/errors')
 const torrentPoster = require('./lib/torrent-poster')
 // Report when the process crashes
 crashReporter.init()
 // Send & receive messages from the main window
 const ipc = electron.ipcRenderer
 // Force use of webtorrent trackers on all torrents
 global.WEBTORRENT_ANNOUNCE = defaultAnnounceList
  .map((arr) => arr[0])
  .filter((url) => url.indexOf('wss://') === 0 || url.indexOf('ws://') === 0)
 /**
 * WebTorrent version.
 */
@@ -26,9 +41,10 @@ const VERSION = require('../../package.json').version
 *   '0.16.1' -> '0016'
 *   '1.2.5' -> '0102'
 */
-const VERSION_STR = VERSION
+const VERSION_STR = VERSION.match(/([0-9]+)/g)
-  .replace(/\d*./g, v => `0${v % 100}`.slice(-2))
+  .slice(0, 2)
-  .slice(0, 4)
+  .map((v) => zeroFill(2, v))
  .join('')
 /**
 * Version prefix string (used in peer ID). WebTorrent uses the Azureus-style
@@ -59,31 +75,29 @@ init()
 function init () {
  listenToClientEvents()
-  ipcRenderer.on('wt-set-global-trackers', (e, globalTrackers) =>
+  ipc.on('wt-start-torrenting', (e, torrentKey, torrentID, path, fileModtimes, selections) =>
    setGlobalTrackers(globalTrackers))
  ipcRenderer.on('wt-start-torrenting', (e, torrentKey, torrentID, path, fileModtimes, selections) =>
    startTorrenting(torrentKey, torrentID, path, fileModtimes, selections))
-  ipcRenderer.on('wt-stop-torrenting', (e, infoHash) =>
+  ipc.on('wt-stop-torrenting', (e, infoHash) =>
    stopTorrenting(infoHash))
-  ipcRenderer.on('wt-create-torrent', (e, torrentKey, options) =>
+  ipc.on('wt-create-torrent', (e, torrentKey, options) =>
    createTorrent(torrentKey, options))
-  ipcRenderer.on('wt-save-torrent-file', (e, torrentKey) =>
+  ipc.on('wt-save-torrent-file', (e, torrentKey) =>
    saveTorrentFile(torrentKey))
-  ipcRenderer.on('wt-generate-torrent-poster', (e, torrentKey) =>
+  ipc.on('wt-generate-torrent-poster', (e, torrentKey) =>
    generateTorrentPoster(torrentKey))
-  ipcRenderer.on('wt-get-audio-metadata', (e, infoHash, index) =>
+  ipc.on('wt-get-audio-metadata', (e, infoHash, index) =>
    getAudioMetadata(infoHash, index))
-  ipcRenderer.on('wt-start-server', (e, infoHash) =>
+  ipc.on('wt-start-server', (e, infoHash) =>
    startServer(infoHash))
-  ipcRenderer.on('wt-stop-server', () =>
+  ipc.on('wt-stop-server', (e) =>
    stopServer())
-  ipcRenderer.on('wt-select-files', (e, infoHash, selections) =>
+  ipc.on('wt-select-files', (e, infoHash, selections) =>
    selectFiles(infoHash, selections))
-  ipcRenderer.send('ipcReadyWebTorrent')
+  ipc.send('ipcReadyWebTorrent')
  window.addEventListener('error', (e) =>
-    ipcRenderer.send('wt-uncaught-error', { message: e.error.message, stack: e.error.stack }),
+    ipc.send('wt-uncaught-error', { message: e.error.message, stack: e.error.stack }),
  true)
  setInterval(updateTorrentProgress, 1000)
@@ -91,13 +105,8 @@ function init () {
 }
 function listenToClientEvents () {
-  client.on('warning', (err) => ipcRenderer.send('wt-warning', null, err.message))
+  client.on('warning', (err) => ipc.send('wt-warning', null, err.message))
-  client.on('error', (err) => ipcRenderer.send('wt-error', null, err.message))
+  client.on('error', (err) => ipc.send('wt-error', null, err.message))
 }
 // Sets the default trackers
 function setGlobalTrackers (globalTrackers) {
  globalThis.WEBTORRENT_ANNOUNCE = globalTrackers
 }
 // Starts a given TorrentID, which can be an infohash, magnet URI, etc.
@@ -106,8 +115,8 @@ function startTorrenting (torrentKey, torrentID, path, fileModtimes, selections)
  console.log('starting torrent %s: %s', torrentKey, torrentID)
  const torrent = client.add(torrentID, {
-    path,
+    path: path,
-    fileModtimes
+    fileModtimes: fileModtimes
  })
  torrent.key = torrentKey
@@ -131,44 +140,44 @@ function createTorrent (torrentKey, options) {
  const torrent = client.seed(paths, options)
  torrent.key = torrentKey
  addTorrentEvents(torrent)
-  ipcRenderer.send('wt-new-torrent')
+  ipc.send('wt-new-torrent')
 }
 function addTorrentEvents (torrent) {
  torrent.on('warning', (err) =>
-    ipcRenderer.send('wt-warning', torrent.key, err.message))
+    ipc.send('wt-warning', torrent.key, err.message))
  torrent.on('error', (err) =>
-    ipcRenderer.send('wt-error', torrent.key, err.message))
+    ipc.send('wt-error', torrent.key, err.message))
  torrent.on('infoHash', () =>
-    ipcRenderer.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)
  function torrentMetadata () {
    const info = getTorrentInfo(torrent)
-    ipcRenderer.send('wt-metadata', torrent.key, info)
+    ipc.send('wt-metadata', torrent.key, info)
    updateTorrentProgress()
  }
  function torrentReady () {
    const info = getTorrentInfo(torrent)
-    ipcRenderer.send('wt-ready', torrent.key, info)
+    ipc.send('wt-ready', torrent.key, info)
-    ipcRenderer.send('wt-ready-' + torrent.infoHash, torrent.key, info)
+    ipc.send('wt-ready-' + torrent.infoHash, torrent.key, info)
    updateTorrentProgress()
  }
  function torrentDone () {
    const info = getTorrentInfo(torrent)
-    ipcRenderer.send('wt-done', torrent.key, info)
+    ipc.send('wt-done', torrent.key, info)
    updateTorrentProgress()
-    torrent.getFileModtimes((err, fileModtimes) => {
+    torrent.getFileModtimes(function (err, fileModtimes) {
      if (err) return onError(err)
-      ipcRenderer.send('wt-file-modtimes', torrent.key, fileModtimes)
+      ipc.send('wt-file-modtimes', torrent.key, fileModtimes)
    })
  }
 }
@@ -201,19 +210,19 @@ function saveTorrentFile (torrentKey) {
  const torrent = getTorrent(torrentKey)
  const torrentPath = path.join(config.TORRENT_PATH, torrent.infoHash + '.torrent')
-  fs.access(torrentPath, fs.constants.R_OK, err => {
+  fs.access(torrentPath, fs.constants.R_OK, function (err) {
    const fileName = torrent.infoHash + '.torrent'
    if (!err) {
      // We've already saved the file
-      return ipcRenderer.send('wt-file-saved', torrentKey, fileName)
+      return ipc.send('wt-file-saved', torrentKey, fileName)
    }
    // Otherwise, save the .torrent file, under the app config folder
-    fs.mkdir(config.TORRENT_PATH, { recursive: true }, _ => {
+    mkdirp(config.TORRENT_PATH, function (_) {
-      fs.writeFile(torrentPath, torrent.torrentFile, err => {
+      fs.writeFile(torrentPath, torrent.torrentFile, function (err) {
        if (err) return console.log('error saving torrent file %s: %o', torrentPath, err)
        console.log('saved torrent file %s', torrentPath)
-        return ipcRenderer.send('wt-file-saved', torrentKey, fileName)
+        return ipc.send('wt-file-saved', torrentKey, fileName)
      })
    })
  })
@@ -223,17 +232,17 @@ function saveTorrentFile (torrentKey) {
 // Auto chooses either a frame from a video file, an image, etc
 function generateTorrentPoster (torrentKey) {
  const torrent = getTorrent(torrentKey)
-  torrentPoster(torrent, (err, buf, extension) => {
+  torrentPoster(torrent, function (err, buf, extension) {
    if (err) return console.log('error generating poster: %o', err)
    // save it for next time
-    fs.mkdir(config.POSTER_PATH, { recursive: true }, err => {
+    mkdirp(config.POSTER_PATH, function (err) {
      if (err) return console.log('error creating poster dir: %o', err)
      const posterFileName = torrent.infoHash + extension
      const posterFilePath = path.join(config.POSTER_PATH, posterFileName)
-      fs.writeFile(posterFilePath, buf, err => {
+      fs.writeFile(posterFilePath, buf, function (err) {
        if (err) return console.log('error saving poster: %o', err)
        // show the poster
-        ipcRenderer.send('wt-poster', torrentKey, posterFileName)
+        ipc.send('wt-poster', torrentKey, posterFileName)
      })
    })
  })
@@ -242,23 +251,25 @@ function generateTorrentPoster (torrentKey) {
 function updateTorrentProgress () {
  const progress = getTorrentProgress()
  // TODO: diff torrent-by-torrent, not once for the whole update
-  if (prevProgress && util.isDeepStrictEqual(progress, prevProgress)) {
+  if (prevProgress && deepEqual(progress, prevProgress, { strict: true })) {
    return /* don't send heavy object if it hasn't changed */
  }
-  ipcRenderer.send('wt-progress', progress)
+  ipc.send('wt-progress', progress)
  prevProgress = progress
 }
 function getTorrentProgress () {
  // First, track overall progress
  const progress = client.progress
-  const hasActiveTorrents = client.torrents.some(torrent => torrent.progress !== 1)
+  const hasActiveTorrents = client.torrents.some(function (torrent) {
    return torrent.progress !== 1
  })
  // Track progress for every file in each torrent
  // TODO: ideally this would be tracked by WebTorrent, which could do it
  // more efficiently than looping over torrent.bitfield
-  const torrentProg = client.torrents.map(torrent => {
+  const torrentProg = client.torrents.map(function (torrent) {
-    const fileProg = torrent.files && torrent.files.map(file => {
+    const fileProg = torrent.files && torrent.files.map(function (file, index) {
      const numPieces = file._endPiece - file._startPiece + 1
      let numPiecesPresent = 0
      for (let piece = file._startPiece; piece <= file._endPiece; piece++) {
@@ -298,12 +309,12 @@ function startServer (infoHash) {
  else torrent.once('ready', () => startServerFromReadyTorrent(torrent))
 }
-function startServerFromReadyTorrent (torrent) {
+function startServerFromReadyTorrent (torrent, cb) {
  if (server) return
  // start the streaming torrent-to-http server
  server = torrent.createServer()
-  server.listen(0, () => {
+  server.listen(0, function () {
    const port = server.address().port
    const urlSuffix = ':' + port
    const info = {
@@ -313,8 +324,8 @@ function startServerFromReadyTorrent (torrent) {
      networkAddress: networkAddress()
    }
-    ipcRenderer.send('wt-server-running', info)
+    ipc.send('wt-server-running', info)
-    ipcRenderer.send('wt-server-' + torrent.infoHash, info)
+    ipc.send('wt-server-' + torrent.infoHash, info)
  })
 }
@@ -332,38 +343,26 @@ function getAudioMetadata (infoHash, index) {
  // Set initial matadata to display the filename first.
  const metadata = { title: file.name }
-  ipcRenderer.send('wt-audio-metadata', infoHash, index, metadata)
+  ipc.send('wt-audio-metadata', infoHash, index, metadata)
-  const options = {
+  const options = { native: false,
    native: false,
    skipCovers: true,
    fileSize: file.length,
-    observer: () => {
+    observer: event => {
-      ipcRenderer.send('wt-audio-metadata', infoHash, index, {
+      ipc.send('wt-audio-metadata', infoHash, index, event.metadata)
-        common: metadata.common,
+    } }
-        format: metadata.format
+  const onMetaData = file.done
      })
    }
  }
  const onMetadata = file.done
    // If completed; use direct file access
    ? mm.parseFile(path.join(torrent.path, file.path), options)
    // otherwise stream
    : mm.parseStream(file.createReadStream(), file.name, options)
-  onMetadata
+  onMetaData
-    .then(
+    .then(() => {
-      metadata => {
+      console.log(`metadata for file='${file.name}' completed.`)
-        ipcRenderer.send('wt-audio-metadata', infoHash, index, metadata)
+    }).catch(function (err) {
-        console.log(`metadata for file='${file.name}' completed.`)
+      return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
-      },
+    })
      err => {
        console.log(
          `error getting audio metadata for ${infoHash}:${index}`,
          err
        )
      }
    )
 }
 function selectFiles (torrentOrInfoHash, selections) {
@@ -383,7 +382,7 @@ function selectFiles (torrentOrInfoHash, selections) {
  // selection with individual selections for each file, so we can
  // select/deselect files later on
  if (!selections) {
-    selections = new Array(torrent.files.length).fill(true)
+    selections = torrent.files.map((x) => true)
  }
  // Selections specified incorrectly?
@@ -396,15 +395,15 @@ function selectFiles (torrentOrInfoHash, selections) {
  torrent.deselect(0, torrent.pieces.length - 1, false)
  // Add selections (individual files)
-  selections.forEach((selection, i) => {
+  for (let i = 0; i < selections.length; i++) {
    const file = torrent.files[i]
-    if (selection) {
+    if (selections[i]) {
      file.select()
    } else {
      console.log('deselecting file ' + i + ' of torrent ' + torrent.name)
      file.deselect()
    }
-  })
+  }
 }
 // Gets a WebTorrent handle by torrentKey
@@ -422,7 +421,7 @@ function onError (err) {
 // TODO: remove this once the following bugs are fixed:
 // https://bugs.chromium.org/p/chromium/issues/detail?id=490143
 // https://github.com/electron/electron/issues/7212
-window.testOfflineMode = () => {
+window.testOfflineMode = function () {
  console.log('Test, going OFFLINE')
  client = window.client = new WebTorrent({
    peerId: PEER_ID,
--- a/static/about.html
+++ b/static/about.html
@@ -32,8 +32,8 @@
    <p>
      Version <script>document.write(require('../package.json').version)</script>
      (<script>document.write(require('webtorrent/package.json').version)</script>)
-      (<script>document.write(process.arch)</script>)
+      (<script>document.write(process.arch === 'x64' ? '64-bit' : '32-bit')</script>)
    </p>
-    <p><script>document.write(require('../build/config').APP_COPYRIGHT)</script></p>
+    <p><script>document.write(require('../config').APP_COPYRIGHT)</script></p>
  </body>
 </html>
--- a/static/bigBuckBunny.torrent
+++ b/static/bigBuckBunny.torrent
--- a/static/cosmosLaundromat.torrent
+++ b/static/cosmosLaundromat.torrent
--- 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,25 +0,0 @@
 [Desktop Entry]
 Type=Application
 Name=<%= productName %>
 <% if (genericName) { %>GenericName=<%= genericName %><% } %>
 <% if (description) { %>Comment=<%= description %><% } %>
 Icon=<%= name %>
 <% if (name) { %>Exec=<%= name %> --no-sandbox %U<% } %><%/*HACK: --no-sandbox fixes an Electron 6 bug. See: #1703*/%>
 Terminal=false
 Actions=CreateNewTorrent;OpenTorrentFile;OpenTorrentAddress;
 <% if (mimeType && mimeType.length) { %>MimeType=<%= mimeType.join(';') %>;<% } %>
 <% if (categories && categories.length) { %>Categories=<%= categories.join(';') %>;<% } %>
 StartupNotify=true
 StartupWMClass=<%= productName %>
 [Desktop Action CreateNewTorrent]
 Name=Create New Torrent...
 <% if (name) { %>Exec=<%= name %> --no-sandbox -n <% } %><%/*HACK: --no-sandbox fixes an Electron 6 bug. See: #1703*/%>
 [Desktop Action OpenTorrentFile]
 Name=Open Torrent File...
 <% if (name) { %>Exec=<%= name %> --no-sandbox -o <% } %><%/*HACK: --no-sandbox fixes an Electron 6 bug. See: #1703*/%>
 [Desktop Action OpenTorrentAddress]
 Name=Open Torrent Address...
 <% if (name) { %>Exec=<%= name %> --no-sandbox -u <% } %><%/*HACK: --no-sandbox fixes an Electron 6 bug. See: #1703*/%>
--- a/static/loading.gif
+++ b/static/loading.gif
--- a/static/main.css
+++ b/static/main.css
@@ -71,6 +71,7 @@ table {
 .app {
  -webkit-user-select: none;
  -webkit-app-region: drag;
  height: 100%;
  display: flex;
  flex-flow: column;
@@ -142,7 +143,6 @@ table {
 */
 .header {
  -webkit-app-region: drag;
  background: rgb(40, 40, 40);
  border-bottom: 1px solid rgb(30, 30, 30);
  height: 38px; /* vertically center OS menu buttons (OS X) */
@@ -322,10 +322,6 @@ textarea,
 * TORRENT LIST
 */
 .torrent-list {
  height: 100%;
 }
 .torrent {
  background: linear-gradient(to bottom right, #4B79A1, #283E51);
  background-repeat: no-repeat;
@@ -562,13 +558,6 @@ body.drag .app::after {
  width: 100%;
 }
 .player .name {
  font-size: 20px;
  font-weight: bold;
  line-height: 1.5em;
  margin-bottom: 6px;
 }
 /*
 * PLAYER CONTROLS
 */
@@ -634,11 +623,6 @@ body.drag .app::after {
  margin-top: 6px;
 }
 .player .controls .icon.multi-audio {
  font-size: 26px;
  margin-top: 6px;
 }
 .player .controls .icon.fullscreen {
  font-size: 26px;
  margin-right: 15px;
--- a/static/sintel.torrent
+++ b/static/sintel.torrent
--- a/static/tearsOfSteel.torrent
+++ b/static/tearsOfSteel.torrent
--- a/static/wiredCd.torrent
+++ b/static/wiredCd.torrent
--- a/test/mocks.js
+++ b/test/mocks.js
@@ -1,18 +1,15 @@
 const electron = require('electron')
 const config = require('./config')
-console.log('Mocking electron.dialog.showOpenDialogSync...')
+console.log('Mocking electron.dialog.showOpenDialog...')
-electron.dialog.showOpenDialogSync = showOpenDialogSync
+electron.dialog.showOpenDialog = function (win, opts, cb) {
-
+  const ret = /select.*torrent file/i.test(opts.title)
 function showOpenDialogSync (win, opts) {
  return /select.*torrent file/i.test(opts.title)
    ? config.TORRENT_FILES
    : config.SEED_FILES
  cb(ret)
 }
-console.log('Mocking electron.dialog.showSaveDialogSync...')
+console.log('Mocking electron.remote.dialog.showSaveDialog...')
-electron.dialog.showSaveDialogSync = showSaveDialogSync
+electron.dialog.showSaveDialog = function (win, opts, cb) {
-
+  cb(config.SAVED_TORRENT_FILE)
 function showSaveDialogSync (win, opts) {
  return config.SAVED_TORRENT_FILE
 }
--- 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/Show More
+++ b/Show More