add button to re-download torrent data if missing

Merge pull request #1494 from clujin/fix_empty_array_reduce
#1436: Fix bug empty array reduce in audio poster selection
2018-10-11 01:10:42 +02:00 · 2018-10-07 20:27:33 +02:00 · 2018-10-07 20:15:12 +02:00 · 2018-10-07 10:42:42 -07:00 · 2018-10-06 19:14:03 -07:00 · 2018-10-06 18:59:03 -07:00
139 changed files with 14048 additions and 963 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,3 +1,5 @@
+<!-- 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?**
--- 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/.nodemonignore
+++ b/.nodemonignore
@@ -1,2 +0,0 @@
-build/
-dist/
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,3 @@
 language: node_js
 node_js:
-  - 'node'
-install: npm install standard depcheck walk-sync
+  - lts/*
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -34,5 +34,18 @@
 - PurgingPanda (t3ch0wn3r@gmail.com)
 - Kai Curtis (morecode@kcurtis.com)
 - Omri Litov (omrilitov@gmail.com)
+- Alexey Romanov (romanalexey@gmail.com)
+- Karan Thakkar (karanjthakkar@gmail.com)
+- Nuno Campos (nuno.campos@me.com)
+- Ebrahim Byagowi (ebrahim@gnu.org)
+- Josip Janzic (josip@jjanzic.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)
+- SimplyAhmazing (ahmad19526@gmail.com)
+- Cezar Carneiro (cezargcarneiro@gmail.com)
+- Terry Hau (terryhau@gmail.com)
+- Vítor Galvão (info@vitorgalvao.com)

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

+## v0.20.0 - 2018-04-26
+
+### Added
+
+- Added support for additional audio extensions: 'aiff', 'ape', 'mp2', 'oga', 'opus', 'wma' (#1240)
+
+### Changed
+
+- Displaying filename while music metadata is being downloaded (#1361)
+- Improved the poster selection for audio/music based torrents (#1334)
+- Launch VLC player without the `--video-on-top` flag (#1286)
+
+### Fixed
+
+- Fix silently failing to open magnets links on Linux (#1367)
+
+## v0.19.0 - 2018-01-26
+
+### Added
+- Added watch folder feature: Automatically add new torrent files added to a folder on disk (#1154)
+- Added highest playback priority feature: pauses other active torrents when playback starts (#840)
+- Add 'Start Speaking' and 'Stop Speaking' menu item (Mac) (#439)
+- Add pinch-to-zoom gesture to enter/exit fullscreen (#1148)
+
+### Changed
+- [SECURITY] Mitigate Electron protocol handler issue (Windows)
+- Moved project from Feross's GitHub account to the WebTorrent GitHub organization
+- Updated to electron@1.6.16
+- Updated to material-ui@0.17
+- Treat .FLAC as playable audio (#1127)
+
+### Fixed
+- Fix time and duration so it doesn't bounce in the UI (#1233)
+- Fix 'About WebTorrent' menu location on Windows (#1120)
+
+## v0.18.0 - 2017-02-03
+
+### Added
+- Add a new "Transfers" menu for pausing or resuming all torrents (#1027)
+
+### Changed
+- Update Electron to 1.4.15
+  - Windows 32-bit: App can use 4GB of memory instead of just 2GB
+  - Fix "Portable App" writing crash reports to "%APPDATA%\Temp" (Windows)
+- Updated WebTorrent engine to 0.98.5
+  - Fix issue where http web seeds would sometimes stall
+  - Don't send 'completed' event to tracker again if torrent is already complete
+  - Add more peer ID entropy
+  - Set user-agent header for tracker http requests
+
+### Fixed
+- Fix paste shortcut in tracker list on Create Torrent page (#1112)
+- Auto-focus the 'OK' button in modal dialogs (#1058)
+- Fix formatting issue in the speed stats on the Player page (#1039)
+
+## v0.17.2 - 2016-10-10
+
+### Fixed
+- Windows: Fix impossible-to-delete "Wired CD" default torrent
+- Throttle browser-window 'move' and 'resize' events
+- Fix crash ("Cannot read property 'files' of null" error)
+- Fix crash ("TypeError: Cannot read property 'startPiece' of undefined")
+
+## v0.17.1 - 2016-10-03
+
+### Changed
+- Faster startup (improved by ~25%)
+- Update Electron to 1.4.2
+- Remove support for pasting multiple newline-separated magnet links
+- Reduce UX sound volume
+
+### Fixed
+- Fix external player (VLC, etc.) opening before HTTP server was ready
+- Windows (Portable App): Fix "Portable App" mode
+  - Write application support files to the "Portable Settings" folder
+  - Stop writing Electron "single instance" lock file to "%APPDATA%\Roaming\WebTorrent"
+  - Some temp data is still written to "%APPDATA%\Temp" (will be fixed in future version)
+- Don't show pointer cursor on torrent list checkbox
+- Trim extra whitespace from magnet links pasted into "Open Torrent Address" dialog
+- Fix weird outline on 'Create Torrent' button
+
 ## v0.17.0 - 2016-09-23

 ### Added
@@ -21,7 +102,7 @@
 ## v0.16.0 - 2016-09-18

 ### Added
- **Windows 64-bit support!** ([#931](https://github.com/feross/webtorrent-desktop/pull/931))
+- **Windows 64-bit support!** (#931)
  - Existing 32-bit users will update to 64-bit automatically in next release
  - 64-bit reduces likelihood of out-of-memory errors by increasing the address space

@@ -81,16 +162,13 @@
 ## v0.12.0 - 2016-08-23

 ### Added
-
 - Custom external media player
 - Linux: add system-wide launcher and icons for Debian, including Ubuntu

 ### Changed
-
 - Telemetry improvements: redact stacktraces, log app version

 ### Fixed
-
 - Fix playback and download of default torrents ("missing path" error) (#804)
 - Fix Delete Torrent + Data for newly added magnet links
 - Fix jumpToTime error (#804)
@@ -103,13 +181,11 @@
 - Check for missing default download path and torrent folders on start up (#776)

 ### Changed
-
 - Do not automatically set WebTorrent as the default handler for torrents (#771)
 - Torrents can only be created from the home screen (#770)
 - Update Electron to 1.3.3 (#772)

 ### Fixed
-
 - Allow modifying the default tracker list on the Create Torrent page (#775)
 - Prevent opening multiple stacked Preference windows or Create Torrent windows (#770)
 - Windows: Player window auto-resize does not match video aspect ratio (#565)
@@ -118,13 +194,11 @@
 ## v0.10.0 - 2016-08-05

 ### Added
-
 - Drag-and-drop magnet links (selected text) is now supported (#284)
 - Windows: Add "User Tasks" shortcuts to app icon in Start Menu (#114)
 - Linux: Show badge count for completed torrent downloads

 ### Changed
-
 - Change WebTorrent Desktop peer ID prefix to 'WD' to distinguish from WebTorrent in the browser, 'WW' (#688)
 - Switch UI to React to improve UI rendering speed (#729)
  - The primary bottleneck was actually `hyperx`, not `virtual-dom`.
@@ -141,7 +215,6 @@
  - Location history abstraction released independently as [`location-history`](https://www.npmjs.com/package/location-history)

 ### Fixed
-
 - When streaming to VLC, set VLC window title to torrent file name (#746)
 - Fix "Cannot read property 'numPiecesPresent' of undefined" exception (#695)
 - Fix rare case where config file could not be completely written (#733)
@@ -149,35 +222,29 @@
 ## v0.9.0 - 2016-07-20

 ### Added
-
 - Save selected subtitles
 - Ask for confirmation before deleting torrents
 - Support Debian Jessie

 ### Changed
-
 - Only send telemetry in production
 - Clean up the code. Split main.js, refactor lots of things

 ### Fixed
-
 - Fix state.playing.jumpToTime behavior
 - Remove torrent file and poster image when deleting a torrent

 ## v0.8.1 - 2016-06-24

 ### Added
-
 - New URI handler: stream-magnet

 ### Fixed
-
 - DLNA crashing bug

 ## v0.8.0 - 2016-06-23

 ### Added
-
 - Cast menu: choose which Chromecast, Airplay, or DLNA device you want to use
 - Telemetry: send basic data, plus stats on how often the play button works
 - Make posters from jpeg files, not just jpg
@@ -185,17 +252,14 @@
 - Windows thumbnail bar with a play/pause button

 ### Changed
-
 - Nicer modal styles

 ### Fixed
-
 - Windows tray icon now stays in the right state

 ## v0.7.2 - 2016-06-02

 ### Fixed
-
 - Fix exception that affects users upgrading from v0.5.1 or older
  - Ensure `state.saved.prefs` configuration exists
 - Fix window title on "About WebTorrent" window
@@ -203,23 +267,19 @@
 ## v0.7.1 - 2016-06-02

 ### Changed
-
 - Change "Step Forward" keyboard shortcut to `Alt+Left` (Windows)
 - Change "Step Backward" keyboard shortcut to to `Alt+Right` (Windows)

 ### Fixed
-
 - First time startup bug -- invalid torrent/poster paths

 ## v0.7.0 - 2016-06-02

 ### Added
-
 - Improved AirPlay support -- using the new [`airplayer`](https://www.npmjs.com/package/airplayer) package
 - Remember volume setting in player, for as long as the app is open

 ### Changed
-
 - Add (+) button now also accepts non .torrent files and creates a torrent from
  those files
 - Show prompt text in title bar for open dialogs (OS X)
@@ -229,7 +289,6 @@
  - Fix crash reporter not working (Windows)

 ### Fixed
-
 - Re-enable WebRTC (web peers)! (OS X, Windows)
  - Windows support was disabled in v0.6.1 to work around a bug in Electron
  - OS X support was disabled in v0.4.0 to work around a 100% CPU bug
@@ -240,7 +299,6 @@
 - Fix torrent loading message UI misalignment

 ### Known issues
-
 - When upgrading to WebTorrent Desktop v0.7.0, some torrent metadata (file list,
  selected files, whether torrent is streamable) will be cleared. Just start the
  torrent to re-populate the metadata.
@@ -248,7 +306,6 @@
 ## v0.6.1 - 2016-05-26

 ### Fixed
-
 - Disable WebRTC to work around Electron crash (Windows)
  - Will be re-enabled in the next version of WebTorrent, which will be based on
    the next version of Electron, where the bug is fixed.
@@ -260,7 +317,6 @@
 ## v0.6.0 - 2016-05-24

 ### Added
-
 - Added Preferences page to set Download folder
 - Save video position, resume playback from saved position
 - Add additional video player keyboard shortcuts (#275)
@@ -270,7 +326,6 @@
 - Add announcement feature

 ### Changed
-
 - Nicer player UI
 - Reduce startup jank, improve startup time (#568)
 - Cleanup unsupported codec detection (#569, #570)
@@ -278,7 +333,6 @@
 - Improve subtitle positioning (#551)

 ### Fixed
-
 - Fix Uncaught TypeError: Cannot read property 'update' of undefined (#567)
 - Fix bugs in LocationHistory
  - When player is active, and magnet link is pasted, go back to list
@@ -289,23 +343,19 @@
 ## v0.5.1 - 2016-05-18

 ### Fixed
-
 - Fix auto-updater (OS X, Windows).

 ## v0.5.0 - 2016-05-17

 ### Added
-
 - Select/deselect individual files to torrent.
 - Automatically include subtitle files (.srt, .vtt) from torrent in the subtitles menu.
 - "Add Subtitle File..." menu item.

 ### Changed
-
 - When manually adding subtitle track(s), always switch to the new track.

 ### Fixed
-
 - Magnet links throw exception on app launch. (OS X)
 - Multi-file torrents would not seed in-place, were copied to Downloads folder.
 - Missing 'About WebTorrent' menu item. (Windows)
@@ -314,7 +364,6 @@
 ## v0.4.0 - 2016-05-13

 ### Added
-
 - Better Windows support!
  - Windows 32-bit build.
  - Windows Portable App build.
@@ -337,7 +386,6 @@
 - New default torrent on first launch: The WIRED CD.

 ### Changed
-
 - Improve app startup time by 40%.
 - UI tweaks: Reduce font size, reduce torrent list item height.
 - Add Playback menu for playback-related functionality.
@@ -348,7 +396,6 @@
 - Remove "Add Fake Airplay/Chromecast" menu items.

 ### Fixed
-
 - Disable WebRTC to fix 100% CPU usage/crashes caused by Chromium issue. This is
  temporary. (OS X)
 - When fullscreen, make controls use the full window. (OS X)
@@ -373,24 +420,20 @@ to this release!
 ## v0.3.3 - 2016-04-07

 ### Fixed
-
 - App icon was incorrect (OS X)

 ## v0.3.2 - 2016-04-07

 ### Added
-
 - Register WebTorrent as default handler for magnet links (OS X)

 ### Changed
-
 - Faster startup time (50ms)
 - Update Electron to 0.37.5
  - Remove the white flash when loading pages and resizing the window
  - Fix crash when sending IPC messages

 ### Fixed
-
 - Fix installation bugs with .deb file (Linux)
 - Pause audio reliably when closing the window
 - Enforce minimimum window size when resizing player (for audio-only .mov files, which are 0x0)
@@ -398,17 +441,14 @@ to this release!
 ## v0.3.1 - 2016-04-06

 ### Added
-
 - Add crash reporter to torrent engine process

 ### Fixed
-
 - Fix cast screen background: cover, don't tile

 ## v0.3.0 - 2016-04-06

 ### Added
-
 - **Ubuntu/Debian support!** (.deb installer)
 - **DLNA streaming support**
 - Add "File > Quit" menu item (Linux)
@@ -416,14 +456,12 @@ to this release!
 - Crash reporting

 ### Changed
-
 - On startup, do not re-verify files when timestamps are unchanged
 - Moved torrent engine to an independent process, for better UI performance
 - Removed media queries (UI resizing based on window width)
 - Improved Chromecast icon, when connected

 ### Fixed
-
 - "Download Complete" notification shows consistently
 - Create new torrents and seed them without copying to temporary folder
 - Clicking the "Download Complete" notification will always activate app
@@ -442,7 +480,6 @@ Thanks to @dcposch, @grunjol, and @feross for contributing to this release.
 ## v0.2.0 - 2016-03-29

 ### Added
-
 - Minimise to tray (Windows, Linux)
 - Show spinner and download speed when player is stalled waiting for data
 - Highlight window on drag-and-drop
@@ -451,12 +488,10 @@ Thanks to @dcposch, @grunjol, and @feross for contributing to this release.
    Linux users need to download new versions manually.

 ### Changed
-
 - Renamed WebTorrent.app to WebTorrent Desktop
 - Add Cosmos Laundromat as a default torrent

 ### Fixed
-
 - Only capture media keys when player is active
 - Update WebTorrent to 0.88.1 for performance improvements
  - When seeding, do not proactively connect to new peers
@@ -516,7 +551,7 @@ Windows, and Linux. For now, we're only releasing binaries for OS X.

 WebTorrent Desktop is in ALPHA and under very active development – expect lots more polish in
 the coming weeks! If you know JavaScript and want to help us out, there's
-[lots to do](https://github.com/feross/webtorrent-desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)!
+[lots to do](https://github.com/webtorrent/webtorrent-desktop/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+contribution%22)!

 ### Features

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,7 +24,7 @@ and to avoid style arguments. `npm test` runs `standard` automatically, so you d
 to!

 [standard-image]: https://cdn.rawgit.com/feross/standard/master/badge.svg
-[standard-url]: https://github.com/feross/standard
+[standard-url]: https://standardjs.com

 ## Project Governance

@@ -36,7 +36,7 @@ standard guarded open source project.

 There are a few basic ground-rules for contributors:

-1. **No `--force` pushes** or modifying the Git history in any way.
+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.
@@ -74,6 +74,99 @@ By making a contribution to this project, I certify that:
  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:
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 <h1 align="center">
  <br>
-  <a href="https://webtorrent.io"><img src="https://webtorrent.io/img/WebTorrent.png" alt="WebTorrent" width="200"></a>
+  <a href="https://webtorrent.io">
+    <img src="https://webtorrent.io/img/WebTorrent.png" alt="WebTorrent" width="200">
+  </a>
  <br>
  WebTorrent Desktop
  <br>
@@ -10,20 +12,34 @@
 <h4 align="center">The streaming torrent app. For Mac, Windows, and Linux.</h4>

 <p align="center">
-  <a href="https://gitter.im/feross/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="Gitter"></a>
-  <a href="https://travis-ci.org/feross/webtorrent-desktop"><img src="https://img.shields.io/travis/feross/webtorrent-desktop/master.svg" alt="Travis"></a>
-  <a href="https://github.com/feross/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/feross/webtorrent-desktop.svg" alt="Release"></a>
+  <a href="https://gitter.im/webtorrent/webtorrent"><img src="https://img.shields.io/badge/gitter-join%20chat%20%E2%86%92-brightgreen.svg" alt="gitter"></a>
+  <a href="https://travis-ci.org/webtorrent/webtorrent-desktop"><img src="https://img.shields.io/travis/webtorrent/webtorrent-desktop/master.svg" alt="travis"></a>
+  <a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/release/webtorrent/webtorrent-desktop.svg" alt="github release version"></a>
+  <a href="https://github.com/webtorrent/webtorrent-desktop/releases"><img src="https://img.shields.io/github/downloads/webtorrent/webtorrent-desktop/total.svg" alt="github release downloads"></a>
+  <a href="https://standardjs.com"><img src="https://img.shields.io/badge/code_style-standard-brightgreen.svg" alt="Standard - JavaScript Style Guide"></a>
 </p>

 ## Install

-Download the latest version of WebTorrent Desktop from
-[the official website](https://webtorrent.io/desktop/) or the
-[GitHub releases](https://github.com/feross/webtorrent-desktop/releases) page.
+### Recommended Install

-**WebTorrent Desktop** is under very active development. You can try out the
-current (unstable) development version by cloning the Git repo. See the
-instructions below in the ["How to Contribute"](#how-to-contribute) section.
+Download the latest version of WebTorrent Desktop from
+[the official website](https://webtorrent.io/desktop/):
+
+### [✨ Download WebTorrent Desktop ✨](https://webtorrent.io/desktop/)
+
+### Advanced Install
+
+- Download specific installer files from the [GitHub releases](https://github.com/webtorrent/webtorrent-desktop/releases) page.
+
+- Use [Homebrew-Cask](https://github.com/caskroom/homebrew-cask) to install from the command line:
+
+  ```
+  $ brew cask install webtorrent
+  ```
+
+- Try the (unstable) development version by cloning the Git repository. See the
+  ["How to Contribute"](#how-to-contribute) instructions.

 ## Screenshots

@@ -37,7 +53,7 @@ instructions below in the ["How to Contribute"](#how-to-contribute) section.
 ### Get the code

 ```
-$ git clone https://github.com/feross/webtorrent-desktop.git
+$ git clone https://github.com/webtorrent/webtorrent-desktop.git
 $ cd webtorrent-desktop
 $ npm install
 ```
@@ -65,22 +81,28 @@ $ npm test
 ### Run integration tests

 ```
-$ npm run integration-test
+$ npm run test-integration
 ```

-The integration tests use Spectron and Tape. They click through the app, taking screenshots and comparing each one to a reference. Why screenshots?
+The integration tests use Spectron and Tape. They click through the app, taking screenshots and
+comparing each one to a reference. Why screenshots?

 * Ad-hoc checking makes the tests a lot more work to write
-* Even diffing the whole HTML is not as thorough as screenshot diffing. For example, it wouldn't catch an bug where hitting ESC from a video doesn't correctly restore window size.
+* Even diffing the whole HTML is not as thorough as screenshot diffing. For example, it wouldn't
+  catch an bug where hitting ESC from a video doesn't correctly restore window size.
 * Chrome's own integration tests use screenshot diffing iirc
-* Small UI changes will break a few tests, but the fix is as easy as deleting the offending screenshots and running the tests, which will recreate them with the new look.
-* The resulting Github PR will then show, pixel by pixel, the exact UI changes that were made! Ses https://github.com/blog/817-behold-image-view-modes
+* Small UI changes will break a few tests, but the fix is as easy as deleting the offending
+  screenshots and running the tests, which will recreate them with the new look.
+* The resulting Github PR will then show, pixel by pixel, the exact UI changes that were made! See
+  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 2016 12" Macbook.
+For MacOS, you'll need a Retina screen for the integration tests to pass. Your screen should have
+the same resolution as a 2016 12" Macbook.

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

-When running integration tests, keep the mouse on the edge of the screen and don't touch the mouse or keyboard while the tests are running.
+When running integration tests, keep the mouse on the edge of the screen and don't touch the mouse
+or keyboard while the tests are running.

 ### Package the app

@@ -110,7 +132,7 @@ The following optional arguments are available:
   - `all` - All platforms (default)

 Note: Even with the `--package` option, the auto-update files (.nupkg for Windows,
-*-darwin.zip for Mac) will always be produced.
+-darwin.zip for Mac) will always be produced.

 #### Windows build notes

@@ -145,10 +167,6 @@ Time out? Show a missing codec error?
 The app never sends any personally identifying information, nor does it track which
 torrents you add.

-### Code Style
-
-[![js-standard-style](https://cdn.rawgit.com/feross/standard/master/badge.svg)](https://github.com/feross/standard)
-
 ## License

 MIT. Copyright (c) [WebTorrent, LLC](https://webtorrent.io).
--- 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/clean.js
+++ b/bin/clean.js
@@ -5,13 +5,13 @@
 * Useful for developers.
 */

-var fs = require('fs')
-var os = require('os')
-var path = require('path')
-var rimraf = require('rimraf')
+const fs = require('fs')
+const os = require('os')
+const path = require('path')
+const rimraf = require('rimraf')

-var config = require('../src/config')
-var handlers = require('../src/main/handlers')
+const config = require('../src/config')
+const handlers = require('../src/main/handlers')

 // First, remove generated files
 rimraf.sync('build/')
@@ -21,11 +21,11 @@ rimraf.sync('dist/')
 rimraf.sync(config.CONFIG_PATH)

 // Remove any temporary files
-var tmpPath
+let tmpPath
 try {
  tmpPath = path.join(fs.statSync('/tmp') && '/tmp', 'webtorrent')
 } catch (err) {
-  tmpPath = path.join(os.tmpDir(), 'webtorrent')
+  tmpPath = path.join(os.tmpdir(), 'webtorrent')
 }
 rimraf.sync(tmpPath)

--- a/bin/cmd.js
+++ b/bin/cmd.js
@@ -1,10 +0,0 @@
-#!/usr/bin/env node
-
-var electron = require('electron')
-var cp = require('child_process')
-var path = require('path')
-
-var child = cp.spawn(electron, [path.join(__dirname, '..')], {stdio: 'inherit'})
-child.on('close', function (code) {
-  process.exitCode = code
-})
--- a/bin/extra-lint.js
+++ b/bin/extra-lint.js
@@ -7,16 +7,16 @@ const path = require('path')
 let hasErrors = false

 // Find all Javascript source files
-var files = walkSync('src', {globs: ['**/*.js']})
+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) {
-  var filepath = path.join('src', file)
-  var lines = fs.readFileSync(filepath, 'utf8').split('\n')
+  const filepath = path.join('src', file)
+  const lines = fs.readFileSync(filepath, 'utf8').split('\n')

  lines.forEach(function (line, i) {
-    var error
+    let error

    // Consistent JSX tag closing
    if (line.match(/' {2}\/> *$/) ||
--- a/bin/open-config.js
+++ b/bin/open-config.js
@@ -1,6 +1,6 @@
 #!/usr/bin/env node

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

-open(config.CONFIG_PATH)
+opn(CONFIG_PATH)
--- a/bin/package.js
+++ b/bin/package.js
@@ -1,28 +1,29 @@
 #!/usr/bin/env node

 /**
- * Builds app binaries for Mac, Linux, and Windows.
+ * Builds app binaries for Mac, Windows, and Linux.
 */

-var cp = require('child_process')
-var electronPackager = require('electron-packager')
-var fs = require('fs')
-var minimist = require('minimist')
-var mkdirp = require('mkdirp')
-var os = require('os')
-var path = require('path')
-var rimraf = require('rimraf')
-var series = require('run-series')
-var zip = require('cross-zip')
+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')
+const series = require('run-series')
+const zip = require('cross-zip')

-var config = require('../src/config')
-var pkg = require('../package.json')
+const config = require('../src/config')
+const pkg = require('../package.json')

-var BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION
-var BUILD_PATH = path.join(config.ROOT_PATH, 'build')
-var DIST_PATH = path.join(config.ROOT_PATH, 'dist')
+const BUILD_NAME = config.APP_NAME + '-v' + config.APP_VERSION
+const BUILD_PATH = path.join(config.ROOT_PATH, 'build')
+const DIST_PATH = path.join(config.ROOT_PATH, 'dist')
+const NODE_MODULES_PATH = path.join(config.ROOT_PATH, 'node_modules')

-var argv = minimist(process.argv.slice(2), {
+const argv = minimist(process.argv.slice(2), {
  boolean: [
    'sign'
  ],
@@ -36,6 +37,12 @@ var argv = minimist(process.argv.slice(2), {
 })

 function build () {
+  console.log('Reinstalling node_modules...')
+  rimraf.sync(NODE_MODULES_PATH)
+  cp.execSync('npm install', { stdio: 'inherit' })
+  cp.execSync('npm dedupe', { stdio: 'inherit' })
+
+  console.log('Nuking dist/ and build/...')
  rimraf.sync(DIST_PATH)
  rimraf.sync(BUILD_PATH)

@@ -43,7 +50,7 @@ function build () {
  cp.execSync('npm run build', { NODE_ENV: 'production', stdio: 'inherit' })
  console.log('Build: Transpiled to ES5.')

-  var platform = argv._[0]
+  const platform = argv._[0]
  if (platform === 'darwin') {
    buildDarwin(printDone)
  } else if (platform === 'win32') {
@@ -61,7 +68,7 @@ function build () {
  }
 }

-var all = {
+const all = {
  // The human-readable copyright line for the app. Maps to the `LegalCopyright` metadata
  // property on Windows, and `NSHumanReadableCopyright` on Mac.
  'app-copyright': config.APP_COPYRIGHT,
@@ -89,7 +96,7 @@ var all = {

  // Pattern which specifies which files to ignore when copying files to create the
  // package(s).
-  ignore: /^\/src|^\/dist|\/(appveyor.yml|\.appveyor.yml|\.github|appdmg|AUTHORS|CONTRIBUTORS|bench|benchmark|benchmark\.js|bin|bower\.json|component\.json|coverage|doc|docs|docs\.mli|dragdrop\.min\.js|example|examples|example\.html|example\.js|externs|ipaddr\.min\.js|Makefile|min|minimist|perf|rusha|simplepeer\.min\.js|simplewebsocket\.min\.js|static\/screenshot\.png|test|tests|test\.js|tests\.js|webtorrent\.min\.js|\.[^\/]*|.*\.md|.*\.markdown)$/,
+  ignore: /^\/src|^\/dist|\/(appveyor.yml|\.appveyor.yml|\.github|appdmg|AUTHORS|CONTRIBUTORS|bench|benchmark|benchmark\.js|bin|bower\.json|component\.json|coverage|doc|docs|docs\.mli|dragdrop\.min\.js|example|examples|example\.html|example\.js|externs|ipaddr\.min\.js|Makefile|min|minimist|perf|rusha|simplepeer\.min\.js|simplewebsocket\.min\.js|static\/screenshot\.png|test|tests|test\.js|tests\.js|webtorrent\.min\.js|\.[^/]*|.*\.md|.*\.markdown)$/,

  // The application name.
  name: config.APP_NAME,
@@ -104,11 +111,11 @@ var all = {
  // "devDependencies" before starting to package the app.
  prune: true,

-  // The Electron version with which the app is built (without the leading 'v')
-  version: require('electron/package.json').version
+  // The Electron version that the app is built with (without the leading 'v')
+  electronVersion: require('electron/package.json').version
 }

-var darwin = {
+const darwin = {
  // Build for Mac
  platform: 'darwin',

@@ -129,12 +136,12 @@ var darwin = {
  icon: config.APP_ICON + '.icns'
 }

-var win32 = {
+const win32 = {
  // Build for Windows.
  platform: 'win32',

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

  // Object hash of application metadata to embed into the executable (Windows only)
  win32metadata: {
@@ -163,12 +170,12 @@ var win32 = {
  icon: config.APP_ICON + '.ico'
 }

-var linux = {
+const linux = {
  // Build for Linux.
  platform: 'linux',

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

  // Note: Application icon for Linux is specified via the BrowserWindow `icon` option.
 }
@@ -176,18 +183,18 @@ var linux = {
 build()

 function buildDarwin (cb) {
-  var plist = require('plist')
+  const plist = require('plist')

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

-    var appPath = path.join(buildPath[0], config.APP_NAME + '.app')
-    var contentsPath = path.join(appPath, 'Contents')
-    var resourcesPath = path.join(contentsPath, 'Resources')
-    var infoPlistPath = path.join(contentsPath, 'Info.plist')
-    var infoPlist = plist.parse(fs.readFileSync(infoPlistPath, 'utf8'))
+    const appPath = path.join(buildPath[0], config.APP_NAME + '.app')
+    const contentsPath = path.join(appPath, 'Contents')
+    const resourcesPath = path.join(contentsPath, 'Resources')
+    const infoPlistPath = path.join(contentsPath, 'Info.plist')
+    const infoPlist = plist.parse(fs.readFileSync(infoPlistPath, 'utf8'))

    infoPlist.CFBundleDocumentTypes = [
      {
@@ -261,7 +268,7 @@ function buildDarwin (cb) {
    }

    function signApp (cb) {
-      var sign = require('electron-osx-sign')
+      const sign = require('electron-osx-sign')

      /*
       * Sign the app with Apple Developer ID certificates. We sign the app for 2 reasons:
@@ -276,7 +283,7 @@ function buildDarwin (cb) {
       *   - Xcode Command Line Tools (xcode-select --install)
       *   - Membership in the Apple Developer Program
       */
-      var signOpts = {
+      const signOpts = {
        app: appPath,
        platform: 'darwin',
        verbose: true
@@ -302,8 +309,8 @@ function buildDarwin (cb) {
      // Create .zip file (used by the auto-updater)
      console.log('Mac: Creating zip...')

-      var inPath = path.join(buildPath[0], config.APP_NAME + '.app')
-      var outPath = path.join(DIST_PATH, BUILD_NAME + '-darwin.zip')
+      const inPath = path.join(buildPath[0], config.APP_NAME + '.app')
+      const outPath = path.join(DIST_PATH, BUILD_NAME + '-darwin.zip')
      zip.zipSync(inPath, outPath)

      console.log('Mac: Created zip.')
@@ -312,13 +319,13 @@ function buildDarwin (cb) {
    function packageDmg (cb) {
      console.log('Mac: Creating dmg...')

-      var appDmg = require('appdmg')
+      const appDmg = require('appdmg')

-      var targetPath = path.join(DIST_PATH, BUILD_NAME + '.dmg')
+      const targetPath = path.join(DIST_PATH, BUILD_NAME + '.dmg')
      rimraf.sync(targetPath)

      // Create a .dmg (Mac disk image) file, for easy user installation.
-      var dmgOpts = {
+      const dmgOpts = {
        basepath: config.ROOT_PATH,
        target: targetPath,
        specification: {
@@ -339,7 +346,7 @@ function buildDarwin (cb) {
        }
      }

-      var dmg = appDmg(dmgOpts)
+      const dmg = appDmg(dmgOpts)
      dmg.once('error', cb)
      dmg.on('progress', function (info) {
        if (info.type === 'step-begin') console.log(info.title + '...')
@@ -353,7 +360,7 @@ function buildDarwin (cb) {
 }

 function buildWin32 (cb) {
-  var installer = require('electron-winstaller')
+  const installer = require('electron-winstaller')
  console.log('Windows: Packaging electron...')

  /*
@@ -361,7 +368,7 @@ function buildWin32 (cb) {
   *   - Windows Authenticode private key and cert (authenticode.p12)
   *   - Windows Authenticode password file (authenticode.txt)
   */
-  var CERT_PATH
+  let CERT_PATH
  try {
    fs.accessSync('D:')
    CERT_PATH = 'D:'
@@ -373,12 +380,12 @@ function buildWin32 (cb) {
    if (err) return cb(err)
    console.log('Windows: Packaged electron. ' + buildPath)

-    var signWithParams
+    let signWithParams
    if (process.platform === 'win32') {
      if (argv.sign) {
-        var certificateFile = path.join(CERT_PATH, 'authenticode.p12')
-        var certificatePassword = fs.readFileSync(path.join(CERT_PATH, 'authenticode.txt'), 'utf8')
-        var timestampServer = 'http://timestamp.comodoca.com'
+        const certificateFile = path.join(CERT_PATH, 'authenticode.p12')
+        const certificatePassword = fs.readFileSync(path.join(CERT_PATH, 'authenticode.txt'), 'utf8')
+        const timestampServer = 'http://timestamp.comodoca.com'
        signWithParams = `/a /f "${certificateFile}" /p "${certificatePassword}" /tr "${timestampServer}" /td sha256`
      } else {
        printWarning()
@@ -387,9 +394,9 @@ function buildWin32 (cb) {
      printWarning()
    }

-    var tasks = []
+    const tasks = []
    buildPath.forEach(function (filesPath) {
-      var destArch = filesPath.split('-').pop()
+      const destArch = filesPath.split('-').pop()

      if (argv.package === 'exe' || argv.package === 'all') {
        tasks.push((cb) => packageInstaller(filesPath, destArch, cb))
@@ -403,7 +410,7 @@ function buildWin32 (cb) {
    function packageInstaller (filesPath, destArch, cb) {
      console.log(`Windows: Creating ${destArch} installer...`)

-      var archStr = destArch === 'ia32' ? '-ia32' : ''
+      const archStr = destArch === 'ia32' ? '-ia32' : ''

      installer.createWindowsInstaller({
        appDirectory: filesPath,
@@ -423,13 +430,18 @@ function buildWin32 (cb) {
         * names (i.e. RELEASES-ia32 instead of RELEASES) and so Squirrel won't
         * find them unless we proxy the requests.
         */
-        remoteReleases: destArch === 'x64'
-          ? config.GITHUB_URL
-          : undefined,
+        // 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: 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,
+        // remoteToken: process.env.WEBTORRENT_GITHUB_API_TOKEN,
        setupExe: config.APP_NAME + 'Setup-v' + config.APP_VERSION + archStr + '.exe',
        setupIcon: config.APP_ICON + '.ico',
        signWithParams: signWithParams,
@@ -437,63 +449,69 @@ function buildWin32 (cb) {
        usePackageJson: false,
        version: pkg.version
      })
-      .then(function () {
-        console.log(`Windows: Created ${destArch} installer.`)
+        .then(function () {
+          console.log(`Windows: Created ${destArch} installer.`)

-        /**
+          /**
         * Delete extraneous Squirrel files (i.e. *.nupkg delta files for older
         * versions of the app)
         */
-        fs.readdirSync(DIST_PATH)
-          .filter((name) => name.endsWith('.nupkg') && !name.includes(pkg.version))
-          .forEach((filename) => {
-            fs.unlinkSync(path.join(DIST_PATH, filename))
-          })
+          fs.readdirSync(DIST_PATH)
+            .filter((name) => name.endsWith('.nupkg') && !name.includes(pkg.version))
+            .forEach((filename) => {
+              fs.unlinkSync(path.join(DIST_PATH, filename))
+            })

-        if (destArch === 'ia32') {
-          console.log('Windows: Renaming ia32 installer files...')
+          if (destArch === 'ia32') {
+            console.log('Windows: Renaming ia32 installer files...')

-          // RELEASES -> RELEASES-ia32
-          var relPath = path.join(DIST_PATH, 'RELEASES-ia32')
-          fs.renameSync(
-            path.join(DIST_PATH, 'RELEASES'),
-            relPath
-          )
+            // 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`)
-          )
+            // 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
-          var relContent = fs.readFileSync(relPath, 'utf8')
-          var relContent32 = relContent.replace('full.nupkg', 'ia32-full.nupkg')
-          fs.writeFileSync(relPath, relContent32)
+            // 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) {
+            if (relContent === relContent32) {
            // Sanity check
-            throw new Error('Fixing RELEASES-ia32 failed. Replacement did not modify the file.')
+              throw new Error('Fixing RELEASES-ia32 failed. Replacement did not modify the file.')
+            }
+
+            console.log('Windows: Renamed ia32 installer files.')
          }

-          console.log('Windows: Renamed ia32 installer files.')
-        }
-
-        cb(null)
-      })
-      .catch(cb)
+          cb(null)
+        })
+        .catch(cb)
    }

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

-      var portablePath = path.join(filesPath, 'Portable Settings')
+      const portablePath = path.join(filesPath, 'Portable Settings')
      mkdirp.sync(portablePath)

-      var archStr = destArch === 'ia32' ? '-ia32' : ''
+      const downloadsPath = path.join(portablePath, 'Downloads')
+      mkdirp.sync(downloadsPath)

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

      console.log(`Windows: Created ${destArch} portable app.`)
@@ -508,9 +526,9 @@ function buildLinux (cb) {
    if (err) return cb(err)
    console.log('Linux: Packaged electron. ' + buildPath)

-    var tasks = []
+    const tasks = []
    buildPath.forEach(function (filesPath) {
-      var destArch = filesPath.split('-').pop()
+      const destArch = filesPath.split('-').pop()

      if (argv.package === 'deb' || argv.package === 'all') {
        tasks.push((cb) => packageDeb(filesPath, destArch, cb))
@@ -526,8 +544,8 @@ function buildLinux (cb) {
    // Create .deb file for Debian-based platforms
    console.log(`Linux: Creating ${destArch} deb...`)

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

    deb.pack({
      package: pkg,
@@ -561,10 +579,10 @@ function buildLinux (cb) {
    // Create .zip file for Linux
    console.log(`Linux: Creating ${destArch} zip...`)

-    var archStr = destArch === 'ia32' ? '-ia32' : ''
+    const archStr = destArch === 'ia32' ? '-ia32' : ''

-    var inPath = path.join(DIST_PATH, path.basename(filesPath))
-    var outPath = path.join(DIST_PATH, BUILD_NAME + '-linux' + archStr + '.zip')
+    const inPath = path.join(DIST_PATH, path.basename(filesPath))
+    const outPath = path.join(DIST_PATH, BUILD_NAME + '-linux' + archStr + '.zip')
    zip.zipSync(inPath, outPath)

    console.log(`Linux: Created ${destArch} zip.`)
--- a/bin/release-_post.sh
+++ b/bin/release-_post.sh
@@ -1,10 +0,0 @@
-#!/bin/sh
-set -e
-
-npm run update-authors
-git diff --exit-code
-npm run package -- --sign
-git push
-git push --tags
-npm publish
-npm run gh-release
--- a/bin/release-_pre.sh
+++ b/bin/release-_pre.sh
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-git pull
-rm -rf node_modules/
-npm install
-npm dedupe
-npm test
--- a/bin/release-major.sh
+++ b/bin/release-major.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-BIN=`dirname $0`
-
-$BIN/release-_pre.sh
-npm version major
-$BIN/release-_post.sh
--- a/bin/release-minor.sh
+++ b/bin/release-minor.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-BIN=`dirname $0`
-
-$BIN/release-_pre.sh
-npm version minor
-$BIN/release-_post.sh
--- a/bin/release-patch.sh
+++ b/bin/release-patch.sh
@@ -1,7 +0,0 @@
-#!/bin/sh
-set -e
-BIN=`dirname $0`
-
-$BIN/release-_pre.sh
-npm version patch
-$BIN/release-_post.sh
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,17 +1,14 @@
 {
  "name": "webtorrent-desktop",
  "description": "WebTorrent, the streaming torrent client. For Mac, Windows, and Linux.",
-  "version": "0.17.0",
+  "version": "0.20.0",
  "author": {
    "name": "WebTorrent, LLC",
    "email": "feross@webtorrent.io",
    "url": "https://webtorrent.io"
  },
-  "bin": {
-    "webtorrent-desktop": "./bin/cmd.js"
-  },
  "bugs": {
-    "url": "https://github.com/feross/webtorrent-desktop/issues"
+    "url": "https://github.com/webtorrent/webtorrent-desktop/issues"
  },
  "dependencies": {
    "airplayer": "^2.0.0",
@@ -19,31 +16,34 @@
    "arch": "^2.0.0",
    "auto-launch": "^4.0.1",
    "bitfield": "^1.0.2",
-    "capture-frame": "^1.0.0",
-    "chromecasts": "^1.8.0",
+    "capture-frame": "^2.0.0",
+    "chokidar": "^2.0.4",
+    "chromecasts": "^1.9.1",
+    "cp-file": "^6.0.0",
    "create-torrent": "^3.24.5",
    "debounce": "^1.0.0",
    "deep-equal": "^1.0.1",
    "dlnacasts": "^0.1.0",
-    "drag-drop": "^2.12.1",
-    "electron": "1.4.1",
-    "es6-error": "^3.0.1",
-    "fs-extra": "^0.30.0",
+    "drag-drop": "^4.1.0",
+    "es6-error": "^4.0.0",
+    "fn-getter": "^1.0.0",
    "iso-639-1": "^1.2.1",
    "languagedetect": "^1.1.1",
    "location-history": "^1.0.0",
-    "material-ui": "^0.15.4",
-    "musicmetadata": "^2.0.2",
+    "material-ui": "^0.17.0",
+    "mkdirp": "^0.5.1",
+    "music-metadata": "^3.1.0",
    "network-address": "^1.1.0",
-    "parse-torrent": "^5.7.3",
+    "parse-torrent": "^6.0.1",
    "prettier-bytes": "^1.0.1",
-    "react": "^15.2.1",
-    "react-dom": "^15.2.1",
-    "react-tap-event-plugin": "^1.0.0",
+    "react": "^15.4.2",
+    "react-dom": "^15.4.2",
+    "react-tap-event-plugin": "^2.0.1",
+    "rimraf": "^2.5.2",
    "run-parallel": "^1.1.6",
    "semver": "^5.1.0",
    "simple-concat": "^1.0.0",
-    "simple-get": "^2.0.0",
+    "simple-get": "^3.0.3",
    "srt-to-vtt": "^1.1.1",
    "vlc-command": "^1.0.1",
    "webtorrent": "0.x",
@@ -51,21 +51,21 @@
    "zero-fill": "^2.2.3"
  },
  "devDependencies": {
-    "buble": "^0.14.0",
+    "babel-eslint": "^9.0.0",
+    "buble": "^0.19.3",
    "cross-zip": "^2.0.1",
    "depcheck": "^0.6.4",
-    "electron-osx-sign": "^0.3.0",
-    "electron-packager": "^8.0.0",
-    "electron-winstaller": "^2.3.0",
-    "gh-release": "^2.0.3",
+    "electron": "1.6.16",
+    "electron-osx-sign": "^0.4.10",
+    "electron-packager": "~8.5.1",
+    "electron-winstaller": "^2.6.4",
+    "gh-release": "^3.2.1",
    "minimist": "^1.2.0",
-    "mkdirp": "^0.5.1",
-    "nobin-debian-installer": "^0.0.10",
+    "nobin-debian-installer": "0.0.10",
    "nodemon": "^1.10.2",
-    "open": "0.0.5",
-    "plist": "^2.0.1",
+    "opn": "^5.4.0",
+    "plist": "^3.0.1",
    "pngjs": "^3.0.0",
-    "rimraf": "^2.5.2",
    "run-series": "^1.1.4",
    "spectron": "^3.3.0",
    "standard": "*",
@@ -91,22 +91,26 @@
  "optionalDependencies": {
    "appdmg": "^0.4.3"
  },
+  "private": true,
  "productName": "WebTorrent",
  "repository": {
    "type": "git",
-    "url": "git://github.com/feross/webtorrent-desktop.git"
+    "url": "git://github.com/webtorrent/webtorrent-desktop.git"
  },
  "scripts": {
    "build": "buble src --output build",
    "clean": "node ./bin/clean.js",
+    "gh-release": "gh-release",
    "open-config": "node ./bin/open-config.js",
    "package": "node ./bin/package.js",
    "prepublish": "npm run build",
    "start": "npm run build && electron .",
-    "integration-test": "npm run build && node ./test",
-    "test": "standard && depcheck --ignores=buble,nodemon,gh-release --ignore-dirs=build,dist && node ./bin/extra-lint.js",
-    "gh-release": "gh-release",
+    "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,pug,css"
+    "watch": "nodemon --exec \"npm run start\" --ext js,css --ignore build/ --ignore dist/"
+  },
+  "standard": {
+    "parser": "babel-eslint"
  }
 }
--- a/src/config.js
+++ b/src/config.js
@@ -1,5 +1,4 @@
 const appConfig = require('application-config')('WebTorrent')
-const fs = require('fs')
 const path = require('path')
 const electron = require('electron')
 const arch = require('arch')
@@ -12,23 +11,19 @@ const IS_TEST = isTest()
 const PORTABLE_PATH = IS_TEST
  ? path.join(process.platform === 'win32' ? 'C:\\Windows\\Temp' : '/tmp', 'WebTorrentTest')
  : path.join(path.dirname(process.execPath), 'Portable Settings')
-const IS_PORTABLE = isPortable()
 const IS_PRODUCTION = isProduction()
+const IS_PORTABLE = isPortable()

 const UI_HEADER_HEIGHT = 38
 const UI_TORRENT_HEIGHT = 100

-console.log('Production: %s portable: %s test: %s',
-  IS_PRODUCTION, IS_PORTABLE, IS_TEST)
-if (IS_PORTABLE) console.log('Portable path: %s', PORTABLE_PATH)
-
 module.exports = {
  ANNOUNCEMENT_URL: 'https://webtorrent.io/desktop/announcement',
  AUTO_UPDATE_URL: 'https://webtorrent.io/desktop/update',
  CRASH_REPORT_URL: 'https://webtorrent.io/desktop/crash-report',
  TELEMETRY_URL: 'https://webtorrent.io/desktop/telemetry',

-  APP_COPYRIGHT: 'Copyright © 2014-2016 ' + 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,
@@ -65,7 +60,7 @@ module.exports = {
    },
    {
      testID: 'wired',
-      name: 'The WIRED CD - Rip. Sample. Mash. Share.',
+      name: 'The WIRED CD - Rip. Sample. Mash. Share',
      posterFileName: 'wiredCd.jpg',
      torrentFileName: 'wiredCd.torrent'
    }
@@ -75,9 +70,9 @@ module.exports = {

  DEFAULT_DOWNLOAD_PATH: getDefaultDownloadPath(),

-  GITHUB_URL: 'https://github.com/feross/webtorrent-desktop',
-  GITHUB_URL_ISSUES: 'https://github.com/feross/webtorrent-desktop/issues',
-  GITHUB_URL_RAW: 'https://raw.githubusercontent.com/feross/webtorrent-desktop/master',
+  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',

  HOME_PAGE_URL: 'https://webtorrent.io',

@@ -116,9 +111,7 @@ function getConfigPath () {
 }

 function getDefaultDownloadPath () {
-  if (!process || !process.type) {
-    return ''
-  } else if (IS_PORTABLE) {
+  if (IS_PORTABLE) {
    return path.join(getConfigPath(), 'Downloads')
  } else {
    return getPath('downloads')
@@ -126,9 +119,14 @@ function getDefaultDownloadPath () {
 }

 function getPath (key) {
-  if (process.type === 'renderer') {
+  if (!process.versions.electron) {
+    // Node.js process
+    return ''
+  } else if (process.type === 'renderer') {
+    // Electron renderer process
    return electron.remote.app.getPath(key)
  } else {
+    // Electron main process
    return electron.app.getPath(key)
  }
 }
@@ -141,8 +139,19 @@ function isPortable () {
  if (IS_TEST) {
    return true
  }
+
+  if (process.platform !== 'win32' || !IS_PRODUCTION) {
+    // Fast path: Non-Windows platforms should not check for path on disk
+    return false
+  }
+
+  const fs = require('fs')
+
  try {
-    return process.platform === 'win32' && IS_PRODUCTION && !!fs.statSync(PORTABLE_PATH)
+    // This line throws if the "Portable Settings" folder does not exist, and does
+    // nothing otherwise.
+    fs.accessSync(PORTABLE_PATH, fs.constants.R_OK | fs.constants.W_OK)
+    return true
  } catch (err) {
    return false
  }
@@ -150,6 +159,7 @@ function isPortable () {

 function isProduction () {
  if (!process.versions.electron) {
+    // Node.js process
    return false
  }
  if (process.platform === 'darwin') {
--- a/src/crash-reporter.js
+++ b/src/crash-reporter.js
@@ -2,10 +2,10 @@ module.exports = {
  init
 }

-const config = require('./config')
-const electron = require('electron')
-
 function init () {
+  const config = require('./config')
+  const electron = require('electron')
+
  electron.crashReporter.start({
    companyName: config.APP_NAME,
    productName: config.APP_NAME,
--- a/src/main/announcement.js
+++ b/src/main/announcement.js
@@ -7,9 +7,8 @@ const electron = require('electron')
 const config = require('../config')
 const log = require('./log')

-const ANNOUNCEMENT_URL = config.ANNOUNCEMENT_URL +
-  '?version=' + config.APP_VERSION +
-  '&platform=' + process.platform
+const ANNOUNCEMENT_URL =
+  `${config.ANNOUNCEMENT_URL}?version=${config.APP_VERSION}&platform=${process.platform}`

 /**
 * In certain situations, the WebTorrent team may need to show an announcement to
--- a/src/main/dock.js
+++ b/src/main/dock.js
@@ -4,7 +4,7 @@ module.exports = {
  setBadge
 }

-const {app, Menu} = require('electron')
+const { app, Menu } = require('electron')

 const dialog = require('./dialog')
 const log = require('./log')
@@ -32,7 +32,7 @@ function downloadFinished (path) {
 */
 function setBadge (count) {
  if (process.platform === 'darwin' ||
-      process.platform === 'linux' && app.isUnityRunning()) {
+      (process.platform === 'linux' && app.isUnityRunning())) {
    log(`setBadge: ${count}`)
    app.setBadgeCount(Number(count))
  }
--- a/src/main/external-player.js
+++ b/src/main/external-player.js
@@ -17,19 +17,18 @@ 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 == null) return vlcCommand((err) => cb(!err))
-  process.nextTick(() => cb(true))
+  if (playerPath == null) return vlcCommand(cb)
+  process.nextTick(() => cb(null))
 }

 function spawn (playerPath, url, title) {
  if (playerPath != null) return spawnExternal(playerPath, [url])

  // Try to find and use VLC if external player is not specified
-  vlcCommand(function (err, vlcPath) {
+  vlcCommand((err, vlcPath) => {
    if (err) return windows.main.dispatch('externalPlayerNotFound')
    const args = [
      '--play-and-exit',
-      '--video-on-top',
      '--quiet',
      `--meta-title=${JSON.stringify(title)}`,
      url
@@ -40,26 +39,26 @@ function spawn (playerPath, url, title) {

 function kill () {
  if (!proc) return
-  log('Killing external player, pid ' + proc.pid)
+  log(`Killing external player, pid ${proc.pid}`)
  proc.kill('SIGKILL') // kill -9
  proc = null
 }

 function spawnExternal (playerPath, args) {
-  log('Running external media player:', playerPath + ' ' + args.join(' '))
+  log('Running external media player:', `${playerPath} ${args.join(' ')}`)

-  if (path.extname(playerPath) === '.app') {
+  if (process.platform === 'darwin' && path.extname(playerPath) === '.app') {
    // Mac: Use executable in packaged .app bundle
-    playerPath += '/Contents/MacOS/' + path.basename(playerPath, '.app')
+    playerPath += `/Contents/MacOS/${path.basename(playerPath, '.app')}`
  }

-  proc = cp.spawn(playerPath, args, {stdio: 'ignore'})
+  proc = cp.spawn(playerPath, args, { stdio: 'ignore' })

  // If it works, close the modal after a second
  const closeModalTimeout = setTimeout(() =>
    windows.main.dispatch('exitModal'), 1000)

-  proc.on('close', function (code) {
+  proc.on('close', code => {
    clearTimeout(closeModalTimeout)
    if (!proc) return // Killed
    log('External player exited with code ', code)
@@ -71,7 +70,7 @@ function spawnExternal (playerPath, args) {
    proc = null
  })

-  proc.on('error', function (e) {
-    log('External player error', e)
+  proc.on('error', err => {
+    log('External player error', err)
  })
 }
--- a/src/main/folder-watcher.js
+++ b/src/main/folder-watcher.js
@@ -0,0 +1,50 @@
+const chokidar = require('chokidar')
+const log = require('./log')
+
+class FolderWatcher {
+  constructor ({ window, state }) {
+    this.window = window
+    this.state = state
+    this.torrentsFolderPath = null
+    this.watching = false
+  }
+
+  isEnabled () {
+    return this.state.saved.prefs.autoAddTorrents
+  }
+
+  start () {
+    // Stop watching previous folder before
+    // start watching a new one.
+    if (this.watching) this.stop()
+
+    const torrentsFolderPath = this.state.saved.prefs.torrentsFolderPath
+    this.torrentsFolderPath = torrentsFolderPath
+    if (!torrentsFolderPath) return
+
+    const glob = `${torrentsFolderPath}/**/*.torrent`
+    log('Folder Watcher: watching: ', glob)
+
+    const options = {
+      ignoreInitial: true,
+      awaitWriteFinish: true
+    }
+    this.watcher = chokidar.watch(glob, options)
+    this.watcher
+      .on('add', (path) => {
+        log('Folder Watcher: added torrent: ', path)
+        this.window.dispatch('addTorrent', path)
+      })
+
+    this.watching = true
+  }
+
+  stop () {
+    log('Folder Watcher: stop.')
+    if (!this.watching) return
+    this.watcher.close()
+    this.watching = false
+  }
+}
+
+module.exports = FolderWatcher
--- a/src/main/handlers.js
+++ b/src/main/handlers.js
@@ -7,26 +7,24 @@ const config = require('../config')
 const path = require('path')

 function install () {
-  if (process.platform === 'darwin') {
-    installDarwin()
-  }
-  if (process.platform === 'win32') {
-    installWin32()
-  }
-  if (process.platform === 'linux') {
-    installLinux()
+  switch (process.platform) {
+    case 'darwin': installDarwin()
+      break
+    case 'win32': installWin32()
+      break
+    case 'linux': installLinux()
+      break
  }
 }

 function uninstall () {
-  if (process.platform === 'darwin') {
-    uninstallDarwin()
-  }
-  if (process.platform === 'win32') {
-    uninstallWin32()
-  }
-  if (process.platform === 'linux') {
-    uninstallLinux()
+  switch (process.platform) {
+    case 'darwin': uninstallDarwin()
+      break
+    case 'win32': uninstallWin32()
+      break
+    case 'linux': uninstallLinux()
+      break
  }
 }

@@ -44,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)
@@ -108,37 +106,37 @@ function installWin32 () {
    setProtocol()

    function setProtocol (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)
      protocolKey.set('', Registry.REG_SZ, name, setURLProtocol)
    }

    function setURLProtocol (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)
      protocolKey.set('URL Protocol', Registry.REG_SZ, '', setIcon)
    }

    function setIcon (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)

      const iconKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + protocol + '\\DefaultIcon'
+        key: `\\Software\\Classes\\${protocol}\\DefaultIcon`
      })
      iconKey.set('', Registry.REG_SZ, icon, setCommand)
    }

    function setCommand (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)

      const commandKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
+        key: `\\Software\\Classes\\${protocol}\\shell\\open\\command`
      })
      commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
    }

    function done (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)
    }
  }

@@ -163,43 +161,43 @@ function installWin32 () {
    function setExt () {
      const extKey = new Registry({
        hive: Registry.HKCU, // HKEY_CURRENT_USER
-        key: '\\Software\\Classes\\' + ext
+        key: `\\Software\\Classes\\${ext}`
      })
      extKey.set('', Registry.REG_SZ, id, setId)
    }

    function setId (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)

      const idKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + id
+        key: `\\Software\\Classes\\${id}`
      })
      idKey.set('', Registry.REG_SZ, name, setIcon)
    }

    function setIcon (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)

      const iconKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + id + '\\DefaultIcon'
+        key: `\\Software\\Classes\\${id}\\DefaultIcon`
      })
      iconKey.set('', Registry.REG_SZ, icon, setCommand)
    }

    function setCommand (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)

      const commandKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + id + '\\shell\\open\\command'
+        key: `\\Software\\Classes\\${id}\\shell\\open\\command`
      })
      commandKey.set('', Registry.REG_SZ, `${commandToArgs(command)} "%1"`, done)
    }

    function done (err) {
-      if (err) log.error(err.message)
+      if (err) return log.error(err.message)
    }
  }
 }
@@ -217,9 +215,9 @@ function uninstallWin32 () {
    function getCommand () {
      const commandKey = new Registry({
        hive: Registry.HKCU, // HKEY_CURRENT_USER
-        key: '\\Software\\Classes\\' + protocol + '\\shell\\open\\command'
+        key: `\\Software\\Classes\\${protocol}\\shell\\open\\command`
      })
-      commandKey.get('', function (err, item) {
+      commandKey.get('', (err, item) => {
        if (!err && item.value.indexOf(commandToArgs(command)) >= 0) {
          destroyProtocol()
        }
@@ -229,9 +227,9 @@ function uninstallWin32 () {
    function destroyProtocol () {
      const protocolKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + protocol
+        key: `\\Software\\Classes\\${protocol}`
      })
-      protocolKey.destroy(function () {})
+      protocolKey.destroy(() => {})
    }
  }

@@ -241,7 +239,7 @@ function uninstallWin32 () {
    function eraseId () {
      const idKey = new Registry({
        hive: Registry.HKCU, // HKEY_CURRENT_USER
-        key: '\\Software\\Classes\\' + id
+        key: `\\Software\\Classes\\${id}`
      })
      idKey.destroy(getExt)
    }
@@ -249,9 +247,9 @@ function uninstallWin32 () {
    function getExt () {
      const extKey = new Registry({
        hive: Registry.HKCU,
-        key: '\\Software\\Classes\\' + ext
+        key: `\\Software\\Classes\\${ext}`
      })
-      extKey.get('', function (err, item) {
+      extKey.get('', (err, item) => {
        if (!err && item.value === id) {
          destroyExt()
        }
@@ -261,9 +259,9 @@ function uninstallWin32 () {
    function destroyExt () {
      const extKey = new Registry({
        hive: Registry.HKCU, // HKEY_CURRENT_USER
-        key: '\\Software\\Classes\\' + ext
+        key: `\\Software\\Classes\\${ext}`
      })
-      extKey.destroy(function () {})
+      extKey.destroy(() => {})
    }
  }
 }
@@ -273,7 +271,7 @@ function commandToArgs (command) {
 }

 function installLinux () {
-  const fs = require('fs-extra')
+  const fs = require('fs')
  const os = require('os')
  const path = require('path')

@@ -300,10 +298,11 @@ function installLinux () {
      ? path.dirname(process.execPath)
      : config.ROOT_PATH

-    desktopFile = desktopFile.replace(/\$APP_NAME/g, config.APP_NAME)
-    desktopFile = desktopFile.replace(/\$APP_PATH/g, appPath)
-    desktopFile = desktopFile.replace(/\$EXEC_PATH/g, EXEC_COMMAND.join(' '))
-    desktopFile = desktopFile.replace(/\$TRY_EXEC_PATH/g, process.execPath)
+    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(),
@@ -313,7 +312,7 @@ function installLinux () {
      'webtorrent-desktop.desktop'
    )
    fs.mkdirp(path.dirname(desktopFilePath))
-    fs.writeFile(desktopFilePath, desktopFile, function (err) {
+    fs.writeFile(desktopFilePath, desktopFile, err => {
      if (err) return log.error(err.message)
    })
  }
@@ -326,6 +325,8 @@ function installLinux () {
  function writeIconFile (err, iconFile) {
    if (err) return log.error(err.message)

+    const mkdirp = require('mkdirp')
+
    const iconFilePath = path.join(
      os.homedir(),
      '.local',
@@ -333,9 +334,11 @@ function installLinux () {
      'icons',
      'webtorrent-desktop.png'
    )
-    fs.mkdirp(path.dirname(iconFilePath))
-    fs.writeFile(iconFilePath, iconFile, function (err) {
+    mkdirp(path.dirname(iconFilePath), err => {
      if (err) return log.error(err.message)
+      fs.writeFile(iconFilePath, iconFile, err => {
+        if (err) log.error(err.message)
+      })
    })
  }
 }
@@ -343,7 +346,7 @@ function installLinux () {
 function uninstallLinux () {
  const os = require('os')
  const path = require('path')
-  const fs = require('fs-extra')
+  const rimraf = require('rimraf')

  const desktopFilePath = path.join(
    os.homedir(),
@@ -352,7 +355,7 @@ function uninstallLinux () {
    'applications',
    'webtorrent-desktop.desktop'
  )
-  fs.removeSync(desktopFilePath)
+  rimraf(desktopFilePath)

  const iconFilePath = path.join(
    os.homedir(),
@@ -361,5 +364,5 @@ function uninstallLinux () {
    'icons',
    'webtorrent-desktop.png'
  )
-  fs.removeSync(iconFilePath)
+  rimraf(iconFilePath)
 }
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -33,9 +33,11 @@ if (process.platform === 'win32') {
  argv = argv.filter((arg) => !arg.includes('--squirrel'))
 }

-if (!shouldQuit) {
+if (!shouldQuit && !config.IS_PORTABLE) {
  // Prevent multiple instances of app from running at same time. New instances
-  // signal this instance and quit.
+  // 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".
  shouldQuit = app.makeSingleInstance(onAppOpen)
  if (shouldQuit) {
    app.quit()
@@ -48,7 +50,11 @@ if (!shouldQuit) {

 function init () {
  if (config.IS_PORTABLE) {
+    const path = require('path')
+    // Put all user data into the "Portable Settings" folder
    app.setPath('userData', config.CONFIG_PATH)
+    // Put Electron crash files, etc. into the "Portable Settings\Temp" folder
+    app.setPath('temp', path.join(config.CONFIG_PATH, 'Temp'))
  }

  const ipcMain = electron.ipcMain
@@ -66,18 +72,21 @@ function init () {
    if (err) throw err

    isReady = true
+    const state = results.state

-    windows.main.init(results.state, {hidden: hidden})
+    windows.main.init(state, { hidden: hidden })
    windows.webtorrent.init()
    menu.init()

    // To keep app startup fast, some code is delayed.
-    setTimeout(delayedInit, config.DELAYED_INIT)
+    setTimeout(() => {
+      delayedInit(state)
+    }, config.DELAYED_INIT)

    // Report uncaught exceptions
    process.on('uncaughtException', (err) => {
      console.error(err)
-      const error = {message: err.message, stack: err.stack}
+      const error = { message: err.message, stack: err.stack }
      windows.main.dispatch('uncaughtError', 'main', error)
    })
  }
@@ -115,18 +124,33 @@ function init () {
  })
 }

-function delayedInit () {
+function delayedInit (state) {
+  if (app.isQuitting) return
+
  const announcement = require('./announcement')
  const dock = require('./dock')
-  const tray = require('./tray')
  const updater = require('./updater')
-  const userTasks = require('./user-tasks')
+  const FolderWatcher = require('./folder-watcher')
+  const folderWatcher = new FolderWatcher({ window: windows.main, state })

  announcement.init()
  dock.init()
-  tray.init()
  updater.init()
-  userTasks.init()
+
+  ipc.setModule('folderWatcher', folderWatcher)
+  if (folderWatcher.isEnabled()) {
+    folderWatcher.start()
+  }
+
+  if (process.platform === 'win32') {
+    const userTasks = require('./user-tasks')
+    userTasks.init()
+  }
+
+  if (process.platform !== 'darwin') {
+    const tray = require('./tray')
+    tray.init()
+  }
 }

 function onOpen (e, torrentId) {
@@ -164,7 +188,7 @@ function onAppOpen (newArgv) {
 function sliceArgv (argv) {
  return argv.slice(config.IS_PRODUCTION ? 1
    : config.IS_TEST ? 4
-    : 2)
+      : 2)
 }

 function processArgv (argv) {
@@ -184,7 +208,7 @@ function processArgv (argv) {
      // Ignore hidden argument, already being handled
    } else if (arg.startsWith('-psn')) {
      // Ignore Mac launchd "process serial number" argument
-      // Issue: https://github.com/feross/webtorrent-desktop/issues/214
+      // Issue: https://github.com/webtorrent/webtorrent-desktop/issues/214
    } else if (arg.startsWith('--')) {
      // Ignore Spectron flags
    } else if (arg === 'data:,') {
--- a/src/main/ipc.js
+++ b/src/main/ipc.js
@@ -1,5 +1,6 @@
 module.exports = {
-  init
+  init,
+  setModule
 }

 const electron = require('electron')
@@ -13,6 +14,14 @@ const windows = require('./windows')
 // Messages from the main process, to be sent once the WebTorrent process starts
 const messageQueueMainToWebTorrent = []

+// Will hold modules injected from the app that will be used on fired
+// IPC events.
+const modules = {}
+
+function setModule (name, module) {
+  modules[name] = module
+}
+
 function init () {
  const ipc = electron.ipcMain

@@ -58,7 +67,7 @@ function init () {
  })

  /**
-   * Events
+   * Player Events
   */

  ipc.on('onPlayerOpen', function () {
@@ -106,6 +115,28 @@ function init () {
    thumbar.onPlayerPause()
  })

+  /**
+   * Folder Watcher Events
+   */
+
+  ipc.on('startFolderWatcher', function () {
+    if (!modules['folderWatcher']) {
+      log('IPC ERR: folderWatcher module is not defined.')
+      return
+    }
+
+    modules['folderWatcher'].start()
+  })
+
+  ipc.on('stopFolderWatcher', function () {
+    if (!modules['folderWatcher']) {
+      log('IPC ERR: folderWatcher module is not defined.')
+      return
+    }
+
+    modules['folderWatcher'].stop()
+  })
+
  /**
   * Shell
   */
@@ -166,8 +197,8 @@ function init () {
  ipc.on('checkForExternalPlayer', function (e, path) {
    const externalPlayer = require('./external-player')

-    externalPlayer.checkInstall(path, function (isInstalled) {
-      windows.main.send('checkForExternalPlayer', isInstalled)
+    externalPlayer.checkInstall(path, function (err) {
+      windows.main.send('checkForExternalPlayer', !err)
    })
  })

--- a/src/main/menu.js
+++ b/src/main/menu.js
@@ -278,6 +278,19 @@ function getMenuTemplate () {
        }
      ]
    },
+    {
+      label: 'Transfers',
+      submenu: [
+        {
+          label: 'Pause All',
+          click: () => windows.main.dispatch('pauseAllTorrents')
+        },
+        {
+          label: 'Resume All',
+          click: () => windows.main.dispatch('resumeAllTorrents')
+        }
+      ]
+    },
    {
      label: 'Help',
      role: 'help',
@@ -311,7 +324,7 @@ function getMenuTemplate () {
  ]

  if (process.platform === 'darwin') {
-    // Add WebTorrent app menu (Mac)
+    // WebTorrent menu (Mac)
    template.unshift({
      label: config.APP_NAME,
      submenu: [
@@ -354,8 +367,26 @@ function getMenuTemplate () {
      ]
    })

-    // Add Window menu (Mac)
-    template.splice(5, 0, {
+    // Edit menu (Mac)
+    template[2].submenu.push(
+      {
+        type: 'separator'
+      },
+      {
+        label: 'Speech',
+        submenu: [
+          {
+            role: 'startspeaking'
+          },
+          {
+            role: 'stopspeaking'
+          }
+        ]
+      }
+    )
+
+    // Window menu (Mac)
+    template.splice(6, 0, {
      role: 'window',
      submenu: [
        {
@@ -395,7 +426,7 @@ function getMenuTemplate () {
      })

    // Help menu (Windows, Linux)
-    template[4].submenu.push(
+    template[5].submenu.push(
      {
        type: 'separator'
      },
--- a/src/main/tray.js
+++ b/src/main/tray.js
@@ -36,8 +36,8 @@ function setWindowFocus (flag) {
 }

 function initLinux () {
-  checkLinuxTraySupport(function (supportsTray) {
-    if (supportsTray) createTray()
+  checkLinuxTraySupport(function (err) {
+    if (!err) createTray()
  })
 }

@@ -55,10 +55,14 @@ function checkLinuxTraySupport (cb) {
  // 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(false)
+    if (err) return cb(err)
    // Unfortunately there's no cleaner way, as far as I can tell, to check
    // whether a debian package is installed:
-    cb(stdout.endsWith('\tinstall\n'))
+    if (stdout.endsWith('\tinstall\n')) {
+      cb(null)
+    } else {
+      cb(new Error('debian package not installed'))
+    }
  })
 }

--- a/src/main/windows/main.js
+++ b/src/main/windows/main.js
@@ -15,6 +15,7 @@ const main = module.exports = {
 }

 const electron = require('electron')
+const debounce = require('debounce')

 const app = electron.app

@@ -31,64 +32,76 @@ function init (state, options) {

  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)
-    minWidth: config.WINDOW_MIN_WIDTH,
    minHeight: config.WINDOW_MIN_HEIGHT,
+    minWidth: config.WINDOW_MIN_WIDTH,
+    show: false,
    title: config.APP_WINDOW_TITLE,
    titleBarStyle: 'hidden-inset', // Hide title bar (Mac)
    useContentSize: true, // Specify web page size without OS chrome
-    show: false,
    width: initialBounds.width,
-    height: initialBounds.height,
    x: initialBounds.x,
    y: initialBounds.y
  })

-  win.once('ready-to-show', function () {
+  win.loadURL(config.WINDOW_MAIN)
+
+  win.once('ready-to-show', () => {
    if (!options.hidden) win.show()
  })

-  win.loadURL(config.WINDOW_MAIN)
+  if (win.setSheetOffset) {
+    win.setSheetOffset(config.UI_HEADER_HEIGHT)
+  }

-  if (win.setSheetOffset) win.setSheetOffset(config.UI_HEADER_HEIGHT)
-
-  win.webContents.on('dom-ready', function () {
+  win.webContents.on('dom-ready', () => {
    menu.onToggleFullScreen(main.win.isFullScreen())
  })

+  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()
+  })
+
  win.on('blur', onWindowBlur)
  win.on('focus', onWindowFocus)

  win.on('hide', onWindowBlur)
  win.on('show', onWindowFocus)

-  win.on('enter-full-screen', function () {
+  win.on('enter-full-screen', () => {
    menu.onToggleFullScreen(true)
    send('fullscreenChanged', true)
    win.setMenuBarVisibility(false)
  })

-  win.on('leave-full-screen', function () {
+  win.on('leave-full-screen', () => {
    menu.onToggleFullScreen(false)
    send('fullscreenChanged', false)
    win.setMenuBarVisibility(true)
  })

-  win.on('move', function (e) {
+  win.on('move', debounce(e => {
    send('windowBoundsChanged', e.sender.getBounds())
-  })
+  }, 1000))

-  win.on('resize', function (e) {
+  win.on('resize', debounce(e => {
    send('windowBoundsChanged', e.sender.getBounds())
-  })
+  }, 1000))

-  win.on('close', function (e) {
-    const tray = require('../tray')
-
-    if (process.platform !== 'darwin' && !tray.hasTray()) {
-      app.quit()
-    } else if (!app.isQuitting) {
+  win.on('close', e => {
+    if (process.platform !== 'darwin') {
+      const tray = require('../tray')
+      if (!tray.hasTray()) {
+        app.quit()
+        return
+      }
+    }
+    if (!app.isQuitting) {
      e.preventDefault()
      hide()
    }
@@ -101,7 +114,7 @@ function dispatch (...args) {

 function hide () {
  if (!main.win) return
-  main.win.send('dispatch', 'backToList')
+  dispatch('backToList')
  main.win.hide()
 }

@@ -125,37 +138,29 @@ function setAspectRatio (aspectRatio) {
 function setBounds (bounds, maximize) {
  // Do nothing in fullscreen
  if (!main.win || main.win.isFullScreen()) {
-    log('setBounds: not setting bounds because we\'re in full screen')
+    log(`setBounds: not setting bounds because we're in full screen`)
    return
  }

  // Maximize or minimize, if the second argument is present
-  let willBeMaximized
-  if (maximize === true) {
-    if (!main.win.isMaximized()) {
-      log('setBounds: maximizing')
-      main.win.maximize()
-    }
-    willBeMaximized = true
-  } else if (maximize === false) {
-    if (main.win.isMaximized()) {
-      log('setBounds: unmaximizing')
-      main.win.unmaximize()
-    }
-    willBeMaximized = false
-  } else {
-    willBeMaximized = main.win.isMaximized()
+  if (maximize === true && !main.win.isMaximized()) {
+    log('setBounds: maximizing')
+    main.win.maximize()
+  } else if (maximize === false && main.win.isMaximized()) {
+    log('setBounds: unmaximizing')
+    main.win.unmaximize()
  }

+  const willBeMaximized = typeof maximize === 'boolean' ? maximize : main.win.isMaximized()
  // Assuming we're not maximized or maximizing, set the window size
  if (!willBeMaximized) {
-    log('setBounds: setting bounds to ' + JSON.stringify(bounds))
+    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 = 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))
+      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)}`)
    }
    // Resize the window's content area (so window border doesn't need to be taken
    // into account)
@@ -226,17 +231,21 @@ function toggleFullScreen (flag) {
 }

 function onWindowBlur () {
-  const tray = require('../tray')
-
  menu.setWindowFocus(false)
-  tray.setWindowFocus(false)
+
+  if (process.platform !== 'darwin') {
+    const tray = require('../tray')
+    tray.setWindowFocus(false)
+  }
 }

 function onWindowFocus () {
-  const tray = require('../tray')
-
  menu.setWindowFocus(true)
-  tray.setWindowFocus(true)
+
+  if (process.platform !== 'darwin') {
+    const tray = require('../tray')
+    tray.setWindowFocus(true)
+  }
 }

 function getIconPath () {
--- a/src/main/windows/webtorrent.js
+++ b/src/main/windows/webtorrent.js
@@ -9,11 +9,11 @@ const webtorrent = module.exports = {
 const electron = require('electron')

 const config = require('../../config')
-const log = require('../log')

 function init () {
  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,
@@ -52,7 +52,6 @@ function send (...args) {

 function toggleDevTools () {
  if (!webtorrent.win) return
-  log('toggleDevTools')
  if (webtorrent.win.webContents.isDevToolsOpened()) {
    webtorrent.win.webContents.closeDevTools()
    webtorrent.win.hide()
--- a/src/renderer/components/create-torrent-error-page.js
+++ b/src/renderer/components/create-torrent-error-page.js
@@ -1,6 +1,6 @@
 const React = require('react')

-const {dispatcher} = require('../lib/dispatcher')
+const { dispatcher } = require('../lib/dispatcher')

 module.exports = class CreateTorrentErrorPage extends React.Component {
  render () {
--- a/src/renderer/components/header.js
+++ b/src/renderer/components/header.js
@@ -1,6 +1,6 @@
 const React = require('react')

-const {dispatcher} = require('../lib/dispatcher')
+const { dispatcher } = require('../lib/dispatcher')

 class Header extends React.Component {
  render () {
--- a/src/renderer/components/modal-ok-cancel.js
+++ b/src/renderer/components/modal-ok-cancel.js
@@ -5,7 +5,7 @@ const RaisedButton = require('material-ui/RaisedButton').default
 module.exports = class ModalOKCancel extends React.Component {
  render () {
    const cancelStyle = { marginRight: 10, color: 'black' }
-    const {cancelText, onCancel, okText, onOK} = this.props
+    const { cancelText, onCancel, okText, onOK } = this.props
    return (
      <div className='float-right'>
        <FlatButton
@@ -17,7 +17,8 @@ module.exports = class ModalOKCancel extends React.Component {
          className='control ok'
          primary
          label={okText}
-          onClick={onOK} />
+          onClick={onOK}
+          autoFocus />
      </div>
    )
  }
--- a/src/renderer/components/open-torrent-address-modal.js
+++ b/src/renderer/components/open-torrent-address-modal.js
@@ -2,7 +2,7 @@ const React = require('react')
 const TextField = require('material-ui/TextField').default

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

 module.exports = class OpenTorrentAddressModal extends React.Component {
  render () {
--- a/src/renderer/components/remove-torrent-modal.js
+++ b/src/renderer/components/remove-torrent-modal.js
@@ -1,7 +1,7 @@
 const React = require('react')

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

 module.exports = class RemoveTorrentModal extends React.Component {
  render () {
--- a/src/renderer/components/unsupported-media-modal.js
+++ b/src/renderer/components/unsupported-media-modal.js
@@ -2,7 +2,7 @@ const React = require('react')
 const electron = require('electron')

 const ModalOKCancel = require('./modal-ok-cancel')
-const {dispatcher} = require('../lib/dispatcher')
+const { dispatcher } = require('../lib/dispatcher')

 module.exports = class UnsupportedMediaModal extends React.Component {
  render () {
--- a/src/renderer/components/update-available-modal.js
+++ b/src/renderer/components/update-available-modal.js
@@ -2,7 +2,7 @@ const React = require('react')
 const electron = require('electron')

 const ModalOKCancel = require('./modal-ok-cancel')
-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')

 module.exports = class UpdateAvailableModal extends React.Component {
  render () {
@@ -23,7 +23,8 @@ module.exports = class UpdateAvailableModal extends React.Component {
    )

    function handleShow () {
-      electron.shell.openExternal('https://github.com/feross/webtorrent-desktop/releases')
+      // TODO: use the GitHub urls from config.js
+      electron.shell.openExternal('https://github.com/webtorrent/webtorrent-desktop/releases')
      dispatch('exitModal')
    }

--- a/src/renderer/controllers/folder-watcher-controller.js
+++ b/src/renderer/controllers/folder-watcher-controller.js
@@ -0,0 +1,13 @@
+const { ipcRenderer } = require('electron')
+
+module.exports = class FolderWatcherController {
+  start () {
+    console.log('-- IPC: start folder watcher')
+    ipcRenderer.send('startFolderWatcher')
+  }
+
+  stop () {
+    console.log('-- IPC: stop folder watcher')
+    ipcRenderer.send('stopFolderWatcher')
+  }
+}
--- a/src/renderer/controllers/media-controller.js
+++ b/src/renderer/controllers/media-controller.js
@@ -1,7 +1,5 @@
-const electron = require('electron')
-
-const ipcRenderer = electron.ipcRenderer
-
+const { ipcRenderer } = require('electron')
+const telemetry = require('../lib/telemetry')
 const Playlist = require('../lib/playlist')

 // Controls local play back: the <video>/<audio> tag and VLC
@@ -12,7 +10,7 @@ module.exports = class MediaController {
  }

  mediaSuccess () {
-    this.state.playing.result = 'success'
+    telemetry.logPlayAttempt('success')
  }

  mediaStalled () {
@@ -22,7 +20,7 @@ module.exports = class MediaController {
  mediaError (error) {
    const state = this.state
    if (state.location.url() === 'player') {
-      state.playing.result = 'error'
+      telemetry.logPlayAttempt('error')
      state.playing.location = 'error'
      ipcRenderer.send('checkForExternalPlayer', state.saved.prefs.externalPlayerPath)
      ipcRenderer.once('checkForExternalPlayer', function (e, isInstalled) {
@@ -56,12 +54,21 @@ module.exports = class MediaController {

  openExternalPlayer () {
    const state = this.state
-    const mediaURL = Playlist.getCurrentLocalURL(this.state)
-    ipcRenderer.send('openExternalPlayer',
-      state.saved.prefs.externalPlayerPath,
-      mediaURL,
-      state.window.title)
    state.playing.location = 'external'
+
+    const onServerRunning = function () {
+      state.playing.isReady = true
+      telemetry.logPlayAttempt('external')
+
+      const mediaURL = Playlist.getCurrentLocalURL(state)
+      ipcRenderer.send('openExternalPlayer',
+        state.saved.prefs.externalPlayerPath,
+        mediaURL,
+        state.window.title)
+    }
+
+    if (state.server != null) onServerRunning()
+    else ipcRenderer.once('wt-server-running', onServerRunning)
  }

  externalPlayerNotFound () {
--- a/src/renderer/controllers/playback-controller.js
+++ b/src/renderer/controllers/playback-controller.js
@@ -2,9 +2,9 @@ const electron = require('electron')
 const path = require('path')

 const Cast = require('../lib/cast')
-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')
 const telemetry = require('../lib/telemetry')
-const {UnplayableFileError, UnplayableTorrentError} = require('../lib/errors')
+const { UnplayableFileError, UnplayableTorrentError } = require('../lib/errors')
 const sound = require('../lib/sound')
 const TorrentPlayer = require('../lib/torrent-player')
 const TorrentSummary = require('../lib/torrent-summary')
@@ -27,6 +27,8 @@ module.exports = class PlaybackController {
  // * Stream, if not already fully downloaded
  // * If no file index is provided, restore the most recently viewed file or autoplay the first
  playFile (infoHash, index /* optional */) {
+    this.pauseActiveTorrents(infoHash)
+
    const state = this.state
    if (state.location.url() === 'player') {
      this.updatePlayer(infoHash, index, false, (err) => {
@@ -84,15 +86,26 @@ module.exports = class PlaybackController {
    else this.pause()
  }

+  pauseActiveTorrents (infoHash) {
+    // Playback Priority: pause all active torrents if needed.
+    if (!this.state.saved.prefs.highestPlaybackPriority) return
+
+    // Do not pause active torrents if playing a fully downloaded torrent.
+    const torrentSummary = TorrentSummary.getByKey(this.state, infoHash)
+    if (torrentSummary.status === 'seeding') return
+
+    dispatch('prioritizeTorrent', infoHash)
+  }
+
  // Play next file in list (if any)
  nextTrack () {
    const state = this.state
    if (Playlist.hasNext(state) && state.playing.location !== 'external') {
      this.updatePlayer(
-          state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
-            if (err) dispatch('error', err)
-            else this.play()
-          })
+        state.playing.infoHash, Playlist.getNextIndex(state), false, (err) => {
+          if (err) dispatch('error', err)
+          else this.play()
+        })
    }
  }

@@ -211,6 +224,7 @@ module.exports = class PlaybackController {
    const torrentSummary = TorrentSummary.getByKey(state, infoHash)

    state.playing.infoHash = torrentSummary.infoHash
+    state.playing.isReady = false

    // update UI to show pending playback
    sound.play('PLAY')
@@ -222,6 +236,8 @@ module.exports = class PlaybackController {

  // Starts WebTorrent server for media streaming
  startServer (torrentSummary) {
+    const state = this.state
+
    if (torrentSummary.status === 'paused') {
      dispatch('startTorrentingSummary', torrentSummary.torrentKey)
      ipcRenderer.once('wt-ready-' + torrentSummary.infoHash,
@@ -232,6 +248,7 @@ module.exports = class PlaybackController {

    function onTorrentReady () {
      ipcRenderer.send('wt-start-server', torrentSummary.infoHash)
+      ipcRenderer.once('wt-server-running', () => { state.playing.isReady = true })
    }
  }

@@ -254,7 +271,7 @@ module.exports = class PlaybackController {
    state.playing.fileIndex = index
    state.playing.type = TorrentPlayer.isVideo(fileSummary) ? 'video'
      : TorrentPlayer.isAudio(fileSummary) ? 'audio'
-      : 'other'
+        : 'other'

    // pick up where we left off
    let jumpToTime = 0
@@ -268,8 +285,16 @@ module.exports = class PlaybackController {
    state.playing.jumpToTime = jumpToTime

    // if it's audio, parse out the metadata (artist, title, etc)
-    if (state.playing.type === 'audio' && !fileSummary.audioInfo) {
-      ipcRenderer.send('wt-get-audio-metadata', torrentSummary.infoHash, index)
+    if (torrentSummary.status === 'paused') {
+      ipcRenderer.once('wt-ready-' + torrentSummary.infoHash, getAudioMetadata)
+    } else {
+      getAudioMetadata()
+    }
+
+    function getAudioMetadata () {
+      if (state.playing.type === 'audio') {
+        ipcRenderer.send('wt-get-audio-metadata', torrentSummary.infoHash, index)
+      }
    }

    // if it's video, check for subtitles files that are done downloading
@@ -312,12 +337,7 @@ module.exports = class PlaybackController {
    // Save volume (this session only, not in state.saved)
    state.previousVolume = state.playing.volume

-    // Telemetry: track what happens after the user clicks play
-    const result = state.playing.result // 'success' or 'error'
-    if (result === 'success') telemetry.logPlayAttempt('success') // first frame displayed
-    else if (result === 'error') telemetry.logPlayAttempt('error') // codec missing, etc
-    else if (result === undefined) telemetry.logPlayAttempt('abandoned') // user gave up waiting
-    else console.error('Unknown state.playing.result', state.playing.result)
+    if (!state.playing.isReady) telemetry.logPlayAttempt('abandoned') // user gave up waiting

    // Reset the window contents back to the home screen
    state.playing = State.getDefaultPlayState()
@@ -334,6 +354,11 @@ module.exports = class PlaybackController {

    ipcRenderer.send('onPlayerClose')

+    // Playback Priority: resume previously paused downloads.
+    if (this.state.saved.prefs.highestPlaybackPriority) {
+      dispatch('resumePausedTorrents')
+    }
+
    this.update()
  }
 }
--- a/src/renderer/controllers/prefs-controller.js
+++ b/src/renderer/controllers/prefs-controller.js
@@ -1,4 +1,4 @@
-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')
 const ipcRenderer = require('electron').ipcRenderer

 // Controls the Preferences screen
@@ -16,45 +16,22 @@ module.exports = class PrefsController {
      setup: function (cb) {
        // initialize preferences
        state.window.title = 'Preferences'
-        state.unsaved = Object.assign(state.unsaved || {}, {
-          prefs: Object.assign({}, state.saved.prefs)
-        })
        ipcRenderer.send('setAllowNav', false)
        cb()
      },
      destroy: () => {
        ipcRenderer.send('setAllowNav', true)
-        this.save()
      }
    })
  }

-  // Updates a single property in the UNSAVED prefs
-  // For example: updatePreferences('foo.bar', 'baz')
-  // Call save() to save to config.json
+  // Updates a single property in the saved prefs
+  // For example: updatePreferences('isFileHandler', true)
  update (property, value) {
-    const path = property.split('.')
-    let obj = this.state.unsaved.prefs
-    let i
-    for (i = 0; i < path.length - 1; i++) {
-      if (typeof obj[path[i]] === 'undefined') {
-        obj[path[i]] = {}
-      }
-      obj = obj[path[i]]
-    }
-    obj[path[i]] = value
-  }
+    if (property === 'isFileHandler') ipcRenderer.send('setDefaultFileHandler', value)
+    else if (property === 'startup') ipcRenderer.send('setStartup', value)

-  // All unsaved prefs take effect atomically, and are saved to config.json
-  save () {
-    const state = this.state
-    if (state.unsaved.prefs.isFileHandler !== state.saved.prefs.isFileHandler) {
-      ipcRenderer.send('setDefaultFileHandler', state.unsaved.prefs.isFileHandler)
-    }
-    if (state.unsaved.prefs.startup !== state.saved.prefs.startup) {
-      ipcRenderer.send('setStartup', state.unsaved.prefs.startup)
-    }
-    state.saved.prefs = Object.assign(state.saved.prefs || {}, state.unsaved.prefs)
+    this.state.saved.prefs[property] = value
    dispatch('stateSaveImmediate')
    dispatch('checkDownloadPath')
  }
--- a/src/renderer/controllers/subtitles-controller.js
+++ b/src/renderer/controllers/subtitles-controller.js
@@ -1,11 +1,11 @@
 const electron = require('electron')
-const fs = require('fs-extra')
+const fs = require('fs')
 const path = require('path')
 const parallel = require('run-parallel')

 const remote = electron.remote

-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')

 module.exports = class SubtitlesController {
  constructor (state) {
--- a/src/renderer/controllers/torrent-controller.js
+++ b/src/renderer/controllers/torrent-controller.js
@@ -3,7 +3,7 @@ const ipcRenderer = require('electron').ipcRenderer

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

 module.exports = class TorrentController {
  constructor (state) {
--- a/src/renderer/controllers/torrent-list-controller.js
+++ b/src/renderer/controllers/torrent-list-controller.js
@@ -2,8 +2,8 @@ const fs = require('fs')
 const path = require('path')
 const electron = require('electron')

-const {dispatch} = require('../lib/dispatcher')
-const {TorrentKeyNotFoundError} = require('../lib/errors')
+const { dispatch } = require('../lib/dispatcher')
+const { TorrentKeyNotFoundError } = require('../lib/errors')
 const sound = require('../lib/sound')
 const TorrentSummary = require('../lib/torrent-summary')

@@ -25,6 +25,11 @@ module.exports = class TorrentListController {
      torrentId = torrentId.path
    }

+    // Trim extra spaces off pasted magnet links
+    if (typeof torrentId === 'string') {
+      torrentId = torrentId.trim()
+    }
+
    // Allow a instant.io link to be pasted
    if (typeof torrentId === 'string' && instantIoRegex.test(torrentId)) {
      torrentId = torrentId.slice(torrentId.indexOf('#') + 1)
@@ -93,6 +98,7 @@ module.exports = class TorrentListController {
    fs.stat(fileOrFolder, function (err) {
      if (err) {
        s.error = 'path-missing'
+        dispatch('backToList')
        return
      }
      start()
@@ -101,7 +107,7 @@ module.exports = class TorrentListController {
    function start () {
      ipcRenderer.send('wt-start-torrenting',
        s.torrentKey,
-        TorrentSummary.getTorrentID(s),
+        TorrentSummary.getTorrentId(s),
        s.path,
        s.fileModtimes,
        s.selections)
@@ -115,11 +121,66 @@ module.exports = class TorrentListController {
      torrentSummary.status = 'new'
      this.startTorrentingSummary(torrentSummary.torrentKey)
      sound.play('ENABLE')
-    } else {
-      torrentSummary.status = 'paused'
-      ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
-      sound.play('DISABLE')
+      return
    }
+
+    this.pauseTorrent(torrentSummary, true)
+  }
+
+  pauseAllTorrents () {
+    this.state.saved.torrents.forEach((torrentSummary) => {
+      if (torrentSummary.status === 'downloading' ||
+          torrentSummary.status === 'seeding') {
+        torrentSummary.status = 'paused'
+        ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
+      }
+    })
+    sound.play('DISABLE')
+  }
+
+  resumeAllTorrents () {
+    this.state.saved.torrents.forEach((torrentSummary) => {
+      if (torrentSummary.status === 'paused') {
+        torrentSummary.status = 'downloading'
+        this.startTorrentingSummary(torrentSummary.torrentKey)
+      }
+    })
+    sound.play('ENABLE')
+  }
+
+  pauseTorrent (torrentSummary, playSound) {
+    torrentSummary.status = 'paused'
+    ipcRenderer.send('wt-stop-torrenting', torrentSummary.infoHash)
+
+    if (playSound) sound.play('DISABLE')
+  }
+
+  prioritizeTorrent (infoHash) {
+    this.state.saved.torrents
+      .filter((torrent) => { // We're interested in active torrents only.
+        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.
+        this.pauseTorrent(torrent, false)
+
+        this.state.saved.torrentsToResume.push(torrent.infoHash)
+      })
+
+    console.log('Playback Priority: paused torrents: ', this.state.saved.torrentsToResume)
+  }
+
+  resumePausedTorrents () {
+    console.log('Playback Priority: resuming paused torrents')
+    if (!this.state.saved.torrentsToResume || !this.state.saved.torrentsToResume.length) return
+    this.state.saved.torrentsToResume.map((infoHash) => {
+      this.toggleTorrent(infoHash)
+    })
+
+    // reset paused torrents
+    this.state.saved.torrentsToResume = []
  }

  toggleTorrentFile (infoHash, index) {
@@ -214,7 +275,8 @@ module.exports = class TorrentListController {

    menu.append(new electron.remote.MenuItem({
      label: 'Save Torrent File As...',
-      click: () => dispatch('saveTorrentFileAs', torrentSummary.torrentKey)
+      click: () => dispatch('saveTorrentFileAs', torrentSummary.torrentKey),
+      enabled: torrentSummary.torrentFileName != null
    }))

    menu.popup(electron.remote.getCurrentWindow())
@@ -253,7 +315,7 @@ module.exports = class TorrentListController {

 // Recursively finds {name, path, size} for all files in a folder
 // Calls `cb` on success, calls `onError` on failure
-function findFilesRecursive (paths, cb) {
+function findFilesRecursive (paths, cb_) {
  if (paths.length > 1) {
    let numComplete = 0
    let ret = []
@@ -262,7 +324,7 @@ function findFilesRecursive (paths, cb) {
        ret.push(...fileObjs)
        if (++numComplete === paths.length) {
          ret.sort((a, b) => a.path < b.path ? -1 : a.path > b.path)
-          cb(ret)
+          cb_(ret)
        }
      })
    })
@@ -276,7 +338,7 @@ function findFilesRecursive (paths, cb) {
    // Files: return name, path, and size
    if (!stat.isDirectory()) {
      const filePath = fileOrFolder
-      return cb([{
+      return cb_([{
        name: path.basename(filePath),
        path: filePath,
        size: stat.size
@@ -288,7 +350,7 @@ function findFilesRecursive (paths, cb) {
    fs.readdir(folderPath, function (err, fileNames) {
      if (err) return dispatch('error', err)
      const paths = fileNames.map((fileName) => path.join(folderPath, fileName))
-      findFilesRecursive(paths, cb)
+      findFilesRecursive(paths, cb_)
    })
  })
 }
--- a/src/renderer/controllers/update-controller.js
+++ b/src/renderer/controllers/update-controller.js
@@ -1,4 +1,4 @@
-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')

 // Controls the UI checking for new versions of the app, prompting install
 module.exports = class UpdateController {
--- a/src/renderer/lib/cast.js
+++ b/src/renderer/lib/cast.js
@@ -13,8 +13,10 @@ module.exports = {
  setRate
 }

+const http = require('http')
+
 const config = require('../../config')
-const {CastingError} = require('./errors')
+const { CastingError } = require('./errors')

 // Lazy load these for a ~300ms improvement in startup time
 let airplayer, chromecasts, dlnacasts
@@ -81,7 +83,7 @@ function testPlayer (type) {
  }

  function getDevices () {
-    return [{name: type + '-1'}, {name: type + '-2'}]
+    return [{ name: type + '-1' }, { name: type + '-2' }]
  }

  function open () {}
@@ -130,22 +132,47 @@ function chromecastPlayer () {
    })
  }

+  function serveSubtitles (callback) {
+    const subtitles = state.playing.subtitles
+    const selectedSubtitle = subtitles.tracks[subtitles.selectedIndex]
+    if (!selectedSubtitle) {
+      callback()
+    } else {
+      ret.subServer = http.createServer((req, res) => {
+        res.writeHead(200, {
+          'Content-Type': 'text/vtt;charset=utf-8',
+          'Access-Control-Allow-Origin': '*',
+          'Transfer-Encoding': 'chunked'
+        })
+        res.end(Buffer.from(selectedSubtitle.buffer.substr(21), 'base64'))
+      }).listen(0, function () {
+        const port = ret.subServer.address().port
+        const subtitlesUrl = 'http://' + state.server.networkAddress + ':' + port + '/'
+        callback(subtitlesUrl)
+      })
+    }
+  }
+
  function open () {
    const torrentSummary = state.saved.torrents.find((x) => x.infoHash === state.playing.infoHash)
-    ret.device.play(state.server.networkURL + '/' + state.playing.fileIndex, {
-      type: 'video/mp4',
-      title: config.APP_NAME + ' - ' + torrentSummary.name
-    }, function (err) {
-      if (err) {
-        state.playing.location = 'local'
-        state.errors.push({
-          time: new Date().getTime(),
-          message: 'Could not connect to Chromecast. ' + err.message
-        })
-      } else {
-        state.playing.location = 'chromecast'
-      }
-      update()
+    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
+      }, function (err) {
+        if (err) {
+          state.playing.location = 'local'
+          state.errors.push({
+            time: new Date().getTime(),
+            message: 'Could not connect to Chromecast. ' + err.message
+          })
+        } else {
+          state.playing.location = 'chromecast'
+        }
+        update()
+      })
    })
  }

@@ -159,6 +186,9 @@ function chromecastPlayer () {

  function stop (callback) {
    ret.device.stop(callback)
+    if (ret.subServer) {
+      ret.subServer.close()
+    }
  }

  function status () {
@@ -388,7 +418,8 @@ function toggleMenu (location) {
  if (state.playing.location !== 'local') {
    throw new CastingError(
      `You can't connect to ${location} when already connected to another device`
-    ) }
+    )
+  }

  // Find all cast devices of the given type
  const player = getPlayer(location)
@@ -398,11 +429,11 @@ function toggleMenu (location) {
  }

  // Show a menu
-  state.devices.castMenu = {location, devices}
+  state.devices.castMenu = { location, devices }
 }

 function selectDevice (index) {
-  const {location, devices} = state.devices.castMenu
+  const { location, devices } = state.devices.castMenu

  // Start casting
  const player = getPlayer(location)
--- a/src/renderer/lib/errors.js
+++ b/src/renderer/lib/errors.js
@@ -29,8 +29,6 @@ class TorrentKeyNotFoundError extends TorrentError {
  constructor (torrentKey) { super(`Can't resolve torrent key ${torrentKey}`) }
 }

-class InvalidTorrentError extends TorrentError {}
-
 module.exports = {
  CastingError,
  PlaybackError,
@@ -39,6 +37,5 @@ module.exports = {
  UnplayableTorrentError,
  UnplayableFileError,
  InvalidSoundNameError,
-  TorrentKeyNotFoundError,
-  InvalidTorrentError
+  TorrentKeyNotFoundError
 }
--- a/src/renderer/lib/media-extensions.js
+++ b/src/renderer/lib/media-extensions.js
@@ -0,0 +1,11 @@
+const mediaExtensions = {
+  audio: [
+    '.aac', '.asf', '.flac', '.m2a', '.m4a', '.m4b', '.mp2', '.mp4',
+    '.mp3', '.oga', '.ogg', '.opus', '.wma', '.wav', '.wv', '.wvp'],
+  video: [
+    '.avi', '.mp4', '.m4v', '.webm', '.mov', '.mkv', 'mpg', 'mpeg',
+    '.ogv', '.webm', '.wmv'],
+  image: ['.gif', '.jpg', '.jpeg', '.png']
+}
+
+module.exports = mediaExtensions
--- a/src/renderer/lib/migrations.js
+++ b/src/renderer/lib/migrations.js
@@ -5,6 +5,7 @@ module.exports = {
 }

 const fs = require('fs')
+const path = require('path')
 const semver = require('semver')

 const config = require('../../config')
@@ -18,37 +19,22 @@ function run (state) {
  }

  const version = state.saved.version
+  const saved = state.saved

-  if (semver.lt(version, '0.7.0')) {
-    migrate_0_7_0(state.saved)
-  }
-
-  if (semver.lt(version, '0.7.2')) {
-    migrate_0_7_2(state.saved)
-  }
-
-  if (semver.lt(version, '0.11.0')) {
-    migrate_0_11_0(state.saved)
-  }
-
-  if (semver.lt(version, '0.12.0')) {
-    migrate_0_12_0(state.saved)
-  }
-
-  if (semver.lt(version, '0.14.0')) {
-    migrate_0_14_0(state.saved)
-  }
-
-  if (semver.lt(version, '0.17.0')) {
-    migrate_0_17_0(state.saved)
-  }
+  if (semver.lt(version, '0.7.0')) migrate_0_7_0(saved)
+  if (semver.lt(version, '0.7.2')) migrate_0_7_2(saved)
+  if (semver.lt(version, '0.11.0')) migrate_0_11_0(saved)
+  if (semver.lt(version, '0.12.0')) migrate_0_12_0(saved)
+  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)

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

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

  saved.torrents.forEach(function (ts) {
@@ -70,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) fs.copySync(src, dst)
+      if (src !== dst) cpFile.sync(src, dst)

      delete ts.torrentPath
      ts.torrentFileName = infoHash + '.torrent'
@@ -85,14 +71,14 @@ 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) fs.copySync(src, dst)
+      if (src !== dst) cpFile.sync(src, dst)

      delete ts.posterURL
      ts.posterFileName = infoHash + extension
    }

    // Fix exception caused by incorrect file ordering.
-    // https://github.com/feross/webtorrent-desktop/pull/604#issuecomment-222805214
+    // https://github.com/webtorrent/webtorrent-desktop/pull/604#issuecomment-222805214
    delete ts.defaultPlayFileIndex
    delete ts.files
    delete ts.selections
@@ -125,7 +111,7 @@ function migrate_0_12_0 (saved) {

  // Undo a terrible bug where clicking Play on a default torrent on a fresh
  // install results in a "path missing" error
-  // See https://github.com/feross/webtorrent-desktop/pull/806
+  // See https://github.com/webtorrent/webtorrent-desktop/pull/806
  const defaultTorrentFiles = [
    '6a9759bffd5c0af65319979fb7832189f4f3c35d.torrent',
    '88594aaacbde40ef3e2510c47374ec0aa396c08e.torrent',
@@ -139,7 +125,7 @@ function migrate_0_12_0 (saved) {
    if (!fileOrFolder) return
    try {
      fs.statSync(fileOrFolder)
-    } catch (e) {
+    } catch (err) {
      // Default torrent with "missing path" error. Clear path.
      delete torrentSummary.path
    }
@@ -163,3 +149,60 @@ function migrate_0_17_0 (saved) {
    })
  })
 }
+
+function migrate_0_17_2 (saved) {
+  // Remove the trailing dot (.) from the Wired CD torrent name, since
+  // 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 cpFile = require('cp-file')
+  const rimraf = require('rimraf')
+
+  const OLD_NAME = 'The WIRED CD - Rip. Sample. Mash. Share.'
+  const NEW_NAME = 'The WIRED CD - Rip. Sample. Mash. Share'
+
+  const OLD_HASH = '3ba219a8634bf7bae3d848192b2da75ae995589d'
+  const NEW_HASH = 'a88fda5954e89178c372716a6a78b8180ed4dad3'
+
+  const ts = saved.torrents.find((ts) => {
+    return ts.infoHash === OLD_HASH
+  })
+
+  if (!ts) return // Wired CD torrent does not exist
+
+  // New versions of WebTorrent ship with a fixed torrent file. Let's fix up the
+  // name in existing versions of WebTorrent.
+  ts.name = ts.displayName = NEW_NAME
+  ts.files.forEach((file) => {
+    file.path = file.path.replace(OLD_NAME, NEW_NAME)
+  })
+
+  // Changing the torrent name causes the info hash to change
+  ts.infoHash = NEW_HASH
+  ts.magnetURI = ts.magnetURI.replace(OLD_HASH, NEW_HASH)
+
+  try {
+    fs.renameSync(
+      path.join(config.POSTER_PATH, ts.posterFileName),
+      path.join(config.POSTER_PATH, NEW_HASH + '.jpg')
+    )
+  } catch (err) {}
+  ts.posterFileName = NEW_HASH + '.jpg'
+
+  rimraf.sync(path.join(config.TORRENT_PATH, ts.torrentFileName))
+  cpFile.sync(
+    path.join(config.STATIC_PATH, 'wiredCd.torrent'),
+    path.join(config.TORRENT_PATH, NEW_HASH + '.torrent')
+  )
+  ts.torrentFileName = NEW_HASH + '.torrent'
+
+  if (ts.path) {
+    // If torrent folder already exists on disk, try to rename it
+    try {
+      fs.renameSync(
+        path.join(ts.path, OLD_NAME),
+        path.join(ts.path, NEW_NAME)
+      )
+    } catch (err) {}
+  }
+}
--- a/src/renderer/lib/playlist.js
+++ b/src/renderer/lib/playlist.js
@@ -72,7 +72,7 @@ function updateCache (state) {

 function findPreviousIndex (state) {
  const files = TorrentSummary.getByKey(state, state.playing.infoHash).files
-  for (var i = state.playing.fileIndex - 1; i >= 0; i--) {
+  for (let i = state.playing.fileIndex - 1; i >= 0; i--) {
    if (TorrentPlayer.isPlayable(files[i])) return i
  }
  return null
@@ -80,7 +80,7 @@ function findPreviousIndex (state) {

 function findNextIndex (state) {
  const files = TorrentSummary.getByKey(state, state.playing.infoHash).files
-  for (var i = state.playing.fileIndex + 1; i < files.length; i++) {
+  for (let i = state.playing.fileIndex + 1; i < files.length; i++) {
    if (TorrentPlayer.isPlayable(files[i])) return i
  }
  return null
--- a/src/renderer/lib/sound.js
+++ b/src/renderer/lib/sound.js
@@ -1,13 +1,12 @@
 module.exports = {
-  preload,
  play
 }

 const config = require('../../config')
-const {InvalidSoundNameError} = require('./errors')
+const { InvalidSoundNameError } = require('./errors')
 const path = require('path')

-const VOLUME = 0.3
+const VOLUME = 0.25

 /* Cache of Audio elements, for instant playback */
 const cache = {}
@@ -23,7 +22,7 @@ const sounds = {
  },
  DISABLE: {
    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'disable.wav'),
-    volume: VOLUME
+    volume: VOLUME * 0.5
  },
  DONE: {
    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'done.wav'),
@@ -31,7 +30,7 @@ const sounds = {
  },
  ENABLE: {
    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'enable.wav'),
-    volume: VOLUME
+    volume: VOLUME * 0.5
  },
  ERROR: {
    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'error.wav'),
@@ -39,7 +38,7 @@ const sounds = {
  },
  PLAY: {
    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'play.wav'),
-    volume: VOLUME * 1.25
+    volume: VOLUME
  },
  STARTUP: {
    url: 'file://' + path.join(config.STATIC_PATH, 'sound', 'startup.wav'),
@@ -47,17 +46,6 @@ const sounds = {
  }
 }

-function preload () {
-  for (let name in sounds) {
-    if (!cache[name]) {
-      const sound = sounds[name]
-      const audio = cache[name] = new window.Audio()
-      audio.volume = sound.volume
-      audio.src = sound.url
-    }
-  }
-}
-
 function play (name) {
  let audio = cache[name]
  if (!audio) {
--- a/src/renderer/lib/state.js
+++ b/src/renderer/lib/state.js
@@ -1,23 +1,28 @@
 const appConfig = require('application-config')('WebTorrent')
-const debounce = require('debounce')
 const path = require('path')
-const {EventEmitter} = require('events')
+const { EventEmitter } = require('events')

 const config = require('../../config')
-const migrations = require('./migrations')

 const SAVE_DEBOUNCE_INTERVAL = 1000

+appConfig.filePath = path.join(config.CONFIG_PATH, 'config.json')
+
 const State = module.exports = Object.assign(new EventEmitter(), {
  getDefaultPlayState,
  load,
  // state.save() calls are rate-limited. Use state.saveImmediate() to skip limit.
-  save: debounce(saveImmediate, SAVE_DEBOUNCE_INTERVAL),
+  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(...arguments)
+  },
  saveImmediate
 })

-appConfig.filePath = path.join(config.CONFIG_PATH, 'config.json')
-
 function getDefaultState () {
  const LocationHistory = require('location-history')

@@ -87,6 +92,7 @@ function getDefaultPlayState () {
    type: null, /* 'audio' or 'video', could be 'other' if ever support eg streaming to VLC */
    currentTime: 0, /* seconds */
    duration: 1, /* seconds */
+    isReady: false,
    isPaused: true,
    isStalled: false,
    lastTimeUpdate: 0, /* Unix time in ms */
@@ -104,9 +110,9 @@ function getDefaultPlayState () {

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

  const saved = {
    prefs: {
@@ -114,38 +120,40 @@ function setupStateSaved (cb) {
      isFileHandler: false,
      openExternalPlayer: false,
      externalPlayerPath: null,
-      startup: false
+      startup: false,
+      autoAddTorrents: false,
+      torrentsFolderPath: '',
+      highestPlaybackPriority: true
    },
    torrents: config.DEFAULT_TORRENTS.map(createTorrentObject),
+    torrentsToResume: [],
    version: config.APP_VERSION /* make sure we can upgrade gracefully later */
  }

  const tasks = []

-  config.DEFAULT_TORRENTS.map(function (t, i) {
+  config.DEFAULT_TORRENTS.forEach((t, i) => {
    const infoHash = saved.torrents[i].infoHash
-    tasks.push(function (cb) {
-      fs.copy(
+    tasks.push(
+      cpFile(
        path.join(config.STATIC_PATH, t.posterFileName),
-        path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName)),
-        cb
+        path.join(config.POSTER_PATH, infoHash + path.extname(t.posterFileName))
      )
-    })
-    tasks.push(function (cb) {
-      fs.copy(
+    )
+    tasks.push(
+      cpFile(
        path.join(config.STATIC_PATH, t.torrentFileName),
-        path.join(config.TORRENT_PATH, infoHash + '.torrent'),
-        cb
+        path.join(config.TORRENT_PATH, infoHash + '.torrent')
      )
-    })
+    )
  })

-  parallel(tasks, function (err) {
-    if (err) return cb(err)
-    cb(null, saved)
-  })
+  Promise.all(tasks)
+    .then(() => cb(null, saved))
+    .catch(err => cb(err))

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

@@ -205,7 +213,13 @@ function load (cb) {
    if (err) return cb(err)
    const state = getDefaultState()
    state.saved = saved
-    migrations.run(state)
+
+    if (process.type === 'renderer') {
+      // Perf optimization: Save require() calls in the main process
+      const migrations = require('./migrations')
+      migrations.run(state)
+    }
+
    cb(null, state)
  }
 }
--- a/src/renderer/lib/telemetry.js
+++ b/src/renderer/lib/telemetry.js
@@ -2,15 +2,12 @@
 // Reports back so that we can improve WebTorrent Desktop
 module.exports = {
  init,
+  send,
  logUncaughtError,
  logPlayAttempt
 }

-const crypto = require('crypto')
 const electron = require('electron')
-const https = require('https')
-const os = require('os')
-const url = require('url')

 const config = require('../../config')

@@ -18,11 +15,18 @@ let telemetry

 function init (state) {
  telemetry = state.saved.telemetry
+
+  // First app run
  if (!telemetry) {
-    telemetry = state.saved.telemetry = createSummary()
+    const crypto = require('crypto')
+    telemetry = state.saved.telemetry = {
+      userID: crypto.randomBytes(32).toString('hex') // 256-bit random ID
+    }
    reset()
  }
+}

+function send (state) {
  const now = new Date()
  telemetry.version = config.APP_VERSION
  telemetry.timestamp = now.toISOString()
@@ -32,15 +36,28 @@ function init (state) {
  telemetry.torrentStats = getTorrentStats(state)
  telemetry.approxNumTorrents = telemetry.torrentStats.approxCount

-  if (config.IS_PRODUCTION) {
-    postToServer()
-    // If the user keeps WebTorrent running for a long time, post every 12h
-    setInterval(postToServer, 12 * 3600 * 1000)
-  } else {
+  if (!config.IS_PRODUCTION) {
    // Development: telemetry used only for local debugging
    // Empty uncaught errors, etc at the start of every run
-    reset()
+    return reset()
  }
+
+  const get = require('simple-get')
+
+  const opts = {
+    url: config.TELEMETRY_URL,
+    body: telemetry,
+    json: true
+  }
+
+  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}`)
+    }
+    console.log('Sent telemetry')
+    reset()
+  })
 }

 function reset () {
@@ -49,47 +66,12 @@ function reset () {
    minVersion: config.APP_VERSION,
    total: 0,
    success: 0,
-    timeout: 0,
    error: 0,
+    external: 0,
    abandoned: 0
  }
 }

-function postToServer () {
-  // Serialize the telemetry summary
-  const payload = new Buffer(JSON.stringify(telemetry), 'utf8')
-
-  // POST to our server
-  const options = url.parse(config.TELEMETRY_URL)
-  options.method = 'POST'
-  options.headers = {
-    'Content-Type': 'application/json',
-    'Content-Length': payload.length
-  }
-
-  const req = https.request(options, function (res) {
-    if (res.statusCode === 200) {
-      console.log('Successfully posted telemetry summary')
-      reset()
-    } else {
-      console.error('Couldn\'t post telemetry summary, got HTTP ' + res.statusCode)
-    }
-  })
-  req.on('error', function (e) {
-    console.error('Couldn\'t post telemetry summary', e)
-  })
-  req.write(payload)
-  req.end()
-}
-
-// Creates a new telemetry summary. Gives the user a unique ID,
-// collects screen resolution, etc
-function createSummary () {
-  // Make a 256-bit random unique ID
-  const userID = crypto.randomBytes(32).toString('hex')
-  return { userID }
-}
-
 // Track screen resolution
 function getScreenInfo () {
  return electron.screen.getAllDisplays().map((screen) => ({
@@ -101,6 +83,7 @@ function getScreenInfo () {

 // Track basic system info like OS version and amount of RAM
 function getSystemInfo () {
+  const os = require('os')
  return {
    osPlatform: process.platform,
    osRelease: os.type() + ' ' + os.release(),
@@ -138,7 +121,7 @@ function getTorrentStats (state) {
  }

  // Then, round all the counts and sums to the nearest power of 2
-  const ret = roundTorrentStats({count, sizeMB})
+  const ret = roundTorrentStats({ count, sizeMB })
  ret.byStatus = {
    new: roundTorrentStats(byStatus.new),
    downloading: roundTorrentStats(byStatus.downloading),
@@ -215,7 +198,7 @@ function logUncaughtError (procName, e) {
  // Log the app version *at the time of the error*
  const version = config.APP_VERSION

-  telemetry.uncaughtErrors.push({process: procName, message, stack, version})
+  telemetry.uncaughtErrors.push({ process: procName, message, stack, version })
 }

 // Turns a DOM element into a string, eg "DIV.my-class.visible"
@@ -223,14 +206,14 @@ function getElemString (elem) {
  let ret = elem.tagName
  try {
    ret += '.' + Array.from(elem.classList).join('.')
-  } catch (e) {}
+  } catch (err) {}
  return ret
 }

-// The user pressed play. It either worked, timed out, or showed the
-// 'Play in VLC' codec error
+// The user pressed play. Did it work, display an error,
+// open an external player or did user abandon the attempt?
 function logPlayAttempt (result) {
-  if (!['success', 'timeout', 'error', 'abandoned'].includes(result)) {
+  if (!['success', 'error', 'external', 'abandoned'].includes(result)) {
    return console.error('Unknown play attempt result', result)
  }

--- a/src/renderer/lib/torrent-player.js
+++ b/src/renderer/lib/torrent-player.js
@@ -8,6 +8,8 @@ module.exports = {

 const path = require('path')

+const mediaExtensions = require('./media-extensions')
+
 // Checks whether a fileSummary or file path is audio/video that we can play,
 // based on the file extension
 function isPlayable (file) {
@@ -16,29 +18,12 @@ function isPlayable (file) {

 // Checks whether a fileSummary or file path is playable video
 function isVideo (file) {
-  return [
-    '.avi',
-    '.m4v',
-    '.mkv',
-    '.mov',
-    '.mp4',
-    '.mpg',
-    '.ogv',
-    '.webm',
-    '.wmv'
-  ].includes(getFileExtension(file))
+  return mediaExtensions.video.includes(getFileExtension(file))
 }

 // Checks whether a fileSummary or file path is playable audio
 function isAudio (file) {
-  return [
-    '.aac',
-    '.ac3',
-    '.mp3',
-    '.ogg',
-    '.wav',
-    '.m4a'
-  ].includes(getFileExtension(file))
+  return mediaExtensions.audio.includes(getFileExtension(file))
 }

 // Checks if the argument is either:
--- a/src/renderer/lib/torrent-poster.js
+++ b/src/renderer/lib/torrent-poster.js
@@ -3,39 +3,143 @@ module.exports = torrentPoster
 const captureFrame = require('capture-frame')
 const path = require('path')

+const mediaExtensions = require('./media-extensions')
+
+const msgNoSuitablePoster = 'Cannot generate a poster from any files in the torrent'
+
 function torrentPoster (torrent, cb) {
  // First, try to use a poster image if available
  const posterFile = torrent.files.filter(function (file) {
    return /^poster\.(jpg|png|gif)$/.test(file.name)
  })[0]
-  if (posterFile) return torrentPosterFromImage(posterFile, torrent, cb)
+  if (posterFile) return extractPoster(posterFile, cb)

-  // Second, try to use the largest video file
-  // Filter out file formats that the <video> tag definitely can't play
-  const videoFile = getLargestFileByExtension(torrent, ['.mp4', '.m4v', '.webm', '.mov', '.mkv'])
-  if (videoFile) return torrentPosterFromVideo(videoFile, torrent, cb)
+  // 'score' each media type based on total size present in torrent
+  const bestScore = ['audio', 'video', 'image'].map(mediaType => {
+    return {
+      type: mediaType,
+      size: calculateDataLengthByExtension(torrent, mediaExtensions[mediaType]) }
+  }).sort((a, b) => { // sort descending on size
+    return b.size - a.size
+  })[0]

-  // Third, try to use the largest image file
-  const imgFile = getLargestFileByExtension(torrent, ['.gif', '.jpg', '.jpeg', '.png'])
-  if (imgFile) return torrentPosterFromImage(imgFile, torrent, cb)
+  if (bestScore.size === 0) {
+    // Admit defeat, no video, audio or image had a significant presence
+    return cb(new Error(msgNoSuitablePoster))
+  }

-  // TODO: generate a waveform from the largest sound file
-  // Finally, admit defeat
-  return cb(new Error('Cannot generate a poster from any files in the torrent'))
+  // Based on which media type is dominant we select the corresponding poster function
+  switch (bestScore.type) {
+    case 'audio':
+      return torrentPosterFromAudio(torrent, cb)
+    case 'image':
+      return torrentPosterFromImage(torrent, cb)
+    case 'video':
+      return torrentPosterFromVideo(torrent, cb)
+  }
 }

+/**
+ * Calculate the total data size of file matching one of the provided extensions
+ * @param torrent
+ * @param extensions List of extension to match
+ * @returns {number} total size, of matches found (>= 0)
+ */
+function calculateDataLengthByExtension (torrent, extensions) {
+  const files = filterOnExtension(torrent, extensions)
+  if (files.length === 0) return 0
+  return files
+    .map(file => file.length)
+    .reduce((a, b) => {
+      return a + b
+    })
+}
+
+/**
+ * Get the largest file of a given torrent, filtered by provided extension
+ * @param torrent Torrent to search in
+ * @param extensions Extension whitelist filter
+ * @returns Torrent file object
+ */
 function getLargestFileByExtension (torrent, extensions) {
-  const files = torrent.files.filter(function (file) {
-    const extname = path.extname(file.name).toLowerCase()
-    return extensions.indexOf(extname) !== -1
-  })
+  const files = filterOnExtension(torrent, extensions)
  if (files.length === 0) return undefined
-  return files.reduce(function (a, b) {
+  return files.reduce((a, b) => {
    return a.length > b.length ? a : b
  })
 }

-function torrentPosterFromVideo (file, torrent, cb) {
+/**
+ * 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 {number} Array of torrent file objects matching one of the given extensions
+ */
+function filterOnExtension (torrent, extensions) {
+  return torrent.files.filter(file => {
+    const extname = path.extname(file.name).toLowerCase()
+    return extensions.indexOf(extname) !== -1
+  })
+}
+
+/**
+ * Returns a score how likely the file is suitable as a poster
+ * @param imgFile File object of an image
+ * @returns {number} Score, higher score is a better match
+ */
+function scoreAudioCoverFile (imgFile) {
+  const fileName = path.basename(imgFile.name, path.extname(imgFile.name)).toLowerCase()
+  const relevanceScore = {
+    cover: 80,
+    folder: 80,
+    album: 80,
+    front: 80,
+    back: 20,
+    spectrogram: -80
+  }
+
+  for (let keyword in relevanceScore) {
+    if (fileName === keyword) {
+      return relevanceScore[keyword]
+    }
+    if (fileName.indexOf(keyword) !== -1) {
+      return relevanceScore[keyword]
+    }
+  }
+  return 0
+}
+
+function torrentPosterFromAudio (torrent, cb) {
+  const imageFiles = filterOnExtension(torrent, mediaExtensions.image)
+
+  if (imageFiles.length === 0) return cb(new Error(msgNoSuitablePoster))
+
+  const bestCover = imageFiles.map(file => {
+    return {
+      file: file,
+      score: scoreAudioCoverFile(file)
+    }
+  }).reduce((a, b) => {
+    if (a.score > b.score) {
+      return a
+    }
+    if (b.score > a.score) {
+      return b
+    }
+    // If score is equal, pick the largest file, aiming for highest resolution
+    if (a.file.length > b.file.length) {
+      return a
+    }
+    return b
+  })
+
+  const extname = path.extname(bestCover.file.name)
+  bestCover.file.getBuffer((err, buf) => cb(err, buf, extname))
+}
+
+function torrentPosterFromVideo (torrent, cb) {
+  const file = getLargestFileByExtension(torrent, mediaExtensions.video)
+
  const index = torrent.files.indexOf(file)

  const server = torrent.createServer(0)
@@ -70,14 +174,19 @@ function torrentPosterFromVideo (file, torrent, cb) {

      server.destroy()

-      if (buf.length === 0) return cb(new Error('Generated poster contains no data'))
+      if (buf.length === 0) return cb(new Error(msgNoSuitablePoster))

      cb(null, buf, '.jpg')
    }
  }
 }

-function torrentPosterFromImage (file, torrent, cb) {
-  const extname = path.extname(file.name)
-  file.getBuffer((err, buf) => cb(err, buf, extname))
+function torrentPosterFromImage (torrent, cb) {
+  const file = getLargestFileByExtension(torrent, mediaExtensions.image)
+  extractPoster(file, cb)
+}
+
+function extractPoster (file, cb) {
+  const extname = path.extname(file.name)
+  file.getBuffer((err, buf) => { return cb(err, buf, extname) })
 }
--- a/src/renderer/lib/torrent-summary.js
+++ b/src/renderer/lib/torrent-summary.js
@@ -2,7 +2,7 @@ module.exports = {
  getPosterPath,
  getTorrentPath,
  getByKey,
-  getTorrentID,
+  getTorrentId,
  getFileOrFolder
 }

@@ -28,7 +28,7 @@ function getPosterPath (torrentSummary) {

 // Expects a torrentSummary
 // Returns a torrentID: filename, magnet URI, or infohash
-function getTorrentID (torrentSummary) {
+function getTorrentId (torrentSummary) {
  const s = torrentSummary
  if (s.torrentFileName) { // Load torrent file from disk
    return getTorrentPath(s)
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -1,8 +1,30 @@
+/**
+ * Perf optimization: Hook into require() to modify how certain modules load:
+ *
+ * - `inline-style-prefixer` (used by `material-ui`) takes ~40ms. It is not
+ *   actually used because auto-prefixing is disabled with
+ *   `darkBaseTheme.userAgent = false`. Return a fake object.
+ */
+let Module = require('module')
+const _require = Module.prototype.require
+Module.prototype.require = function (id) {
+  if (id === 'inline-style-prefixer') return {}
+  return _require.apply(this, arguments)
+}
+
 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.
+
+const State = require('./lib/state')
+State.load(onState)
+
+const createGetter = require('fn-getter')
+const debounce = require('debounce')
 const dragDrop = require('drag-drop')
 const electron = require('electron')
 const fs = require('fs')
@@ -12,22 +34,16 @@ const ReactDOM = require('react-dom')
 const config = require('../config')
 const telemetry = require('./lib/telemetry')
 const sound = require('./lib/sound')
-const State = require('./lib/state')
 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')

-const MediaController = require('./controllers/media-controller')
-const UpdateController = require('./controllers/update-controller')
-const PrefsController = require('./controllers/prefs-controller')
-const PlaybackController = require('./controllers/playback-controller')
-const SubtitlesController = require('./controllers/subtitles-controller')
-const TorrentListController = require('./controllers/torrent-list-controller')
-const TorrentController = require('./controllers/torrent-controller')
-
 // Electron apps have two processes: a main process (node) runs first and starts
 // a renderer process (essentially a Chrome window). We're in the renderer process,
 // and this IPC channel receives from and sends messages to the main process
@@ -50,32 +66,56 @@ let state
 // Root React component
 let app

-State.load(onState)
-
 // Called once when the application loads. (Not once per window.)
 // Connects to the torrent networks, sets up the UI and OS integrations like
 // the dock icon and drag+drop.
 function onState (err, _state) {
  if (err) return onError(err)
-  state = window.state = _state // Make available for easier debugging
+
+  // Make available for easier debugging
+  state = window.state = _state
  window.dispatch = dispatch

  telemetry.init(state)

  // Log uncaught JS errors
-  window.addEventListener('error',
-    (e) => telemetry.logUncaughtError('window', e),
-    true /* capture */)
+  window.addEventListener(
+    'error', (e) => telemetry.logUncaughtError('window', e), true /* capture */
+  )

  // Create controllers
  controllers = {
-    media: new MediaController(state),
-    update: new UpdateController(state),
-    prefs: new PrefsController(state, config),
-    playback: new PlaybackController(state, config, update),
-    subtitles: new SubtitlesController(state),
-    torrentList: new TorrentListController(state),
-    torrent: new TorrentController(state)
+    media: createGetter(() => {
+      const MediaController = require('./controllers/media-controller')
+      return new MediaController(state)
+    }),
+    playback: createGetter(() => {
+      const PlaybackController = require('./controllers/playback-controller')
+      return new PlaybackController(state, config, update)
+    }),
+    prefs: createGetter(() => {
+      const PrefsController = require('./controllers/prefs-controller')
+      return new PrefsController(state, config)
+    }),
+    subtitles: createGetter(() => {
+      const SubtitlesController = require('./controllers/subtitles-controller')
+      return new SubtitlesController(state)
+    }),
+    torrent: createGetter(() => {
+      const TorrentController = require('./controllers/torrent-controller')
+      return new TorrentController(state)
+    }),
+    torrentList: createGetter(() => {
+      return new TorrentListController(state)
+    }),
+    update: createGetter(() => {
+      const UpdateController = require('./controllers/update-controller')
+      return new UpdateController(state)
+    }),
+    folderWatcher: createGetter(() => {
+      const FolderWatcherController = require('./controllers/folder-watcher-controller')
+      return new FolderWatcherController()
+    })
  }

  // Add first page to location history
@@ -90,23 +130,18 @@ function onState (err, _state) {
  // Restart everything we were torrenting last time the app ran
  resumeTorrents()

+  // Initialize ReactDOM
+  app = ReactDOM.render(<App state={state} />, 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
  // a progress bar and to keep the cursor in sync when playing a video
  setInterval(update, 1000)
-  app = ReactDOM.render(<App state={state} />, document.querySelector('#body'))
-
-  // Lazy-load other stuff, like the AppleTV module, later to keep startup fast
-  window.setTimeout(delayedInit, config.DELAYED_INIT)

  // Listen for messages from the main process
  setupIpc()

-  // Warn if the download dir is gone, eg b/c an external drive is unplugged
-  checkDownloadPath()
-
-  // OS integrations:
-  // ...drag and drop files/text to start torrenting or seeding
+  // Drag and drop files/text to start torrenting or seeding
  dragDrop('body', {
    onDrop: onOpen,
    onDropText: onOpen
@@ -115,24 +150,49 @@ function onState (err, _state) {
  // ...same thing if you paste a torrent
  document.addEventListener('paste', onPaste)

+  const debouncedFullscreenToggle = debounce(function () {
+    dispatch('toggleFullScreen')
+  }, 1000, true)
+
+  document.addEventListener('wheel', function (event) {
+    // ctrlKey detects pinch to zoom, http://crbug.com/289887
+    if (event.ctrlKey) {
+      event.preventDefault()
+      debouncedFullscreenToggle()
+    }
+  })
+
  // ...focus and blur. Needed to show correct dock icon text ('badge') in OSX
  window.addEventListener('focus', onFocus)
  window.addEventListener('blur', onBlur)

-  // ...window visibility state.
-  document.addEventListener('webkitvisibilitychange', onVisibilityChange)
-
-  // Done! Ideally we want to get here < 500ms after the user clicks the app
  if (electron.remote.getCurrentWindow().isVisible()) {
    sound.play('STARTUP')
  }
+
+  // To keep app startup fast, some code is delayed.
+  window.setTimeout(delayedInit, config.DELAYED_INIT)
+
+  // Done! Ideally we want to get here < 500ms after the user clicks the app
  console.timeEnd('init')
 }

 // Runs a few seconds after the app loads, to avoid slowing down startup time
 function delayedInit () {
+  telemetry.send(state)
+
+  // Send telemetry data every 12 hours, for users who keep the app running
+  // for extended periods of time
+  setInterval(() => telemetry.send(state), 12 * 3600 * 1000)
+
+  // Warn if the download dir is gone, eg b/c an external drive is unplugged
+  checkDownloadPath()
+
+  // ...window visibility state.
+  document.addEventListener('webkitvisibilitychange', onVisibilityChange)
+  onVisibilityChange()
+
  lazyLoadCast()
-  sound.preload()
 }

 // Lazily loads Chromecast and Airplay support
@@ -150,7 +210,7 @@ function lazyLoadCast () {
 // 3. dispatch - the event handler calls dispatch(), main.js sends it to a controller
 // 4. controller - the controller handles the event, changing the state object
 function update () {
-  controllers.playback.showOrHidePlayerControls()
+  controllers.playback().showOrHidePlayerControls()
  app.setState(state)
  updateElectron()
 }
@@ -178,54 +238,58 @@ const dispatchHandlers = {
  'openFiles': () => ipcRenderer.send('openFiles'), /* shows the open file dialog */
  'openTorrentAddress': () => { state.modal = { id: 'open-torrent-address-modal' } },

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

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

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

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

  // Remote casting: Chromecast, Airplay, etc
  'toggleCastMenu': (deviceType) => lazyLoadCast().toggleMenu(deviceType),
@@ -233,13 +297,15 @@ const dispatchHandlers = {
  'stopCasting': () => lazyLoadCast().stop(),

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

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

  // Navigation between screens (back, forward, ESC, etc)
  'exitModal': () => { state.modal = null },
@@ -277,7 +343,7 @@ function dispatch (action, ...args) {

  // Update the virtual DOM, unless it's just a mouse move event
  if (action !== 'mediaMouseMoved' ||
-      controllers.playback.showOrHidePlayerControls()) {
+      controllers.playback().showOrHidePlayerControls()) {
    update()
  }
 }
@@ -292,10 +358,11 @@ function setupIpc () {
  ipcRenderer.on('fullscreenChanged', onFullscreenChanged)
  ipcRenderer.on('windowBoundsChanged', onWindowBoundsChanged)

-  const tc = controllers.torrent
+  const tc = controllers.torrent()
  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())
  ipcRenderer.on('wt-warning', (e, ...args) => tc.torrentWarning(...args))
  ipcRenderer.on('wt-error', (e, ...args) => tc.torrentError(...args))

@@ -345,7 +412,7 @@ function resumeTorrents () {
      return torrentSummary
    })
    .filter((s) => s.status !== 'paused')
-    .forEach((s) => controllers.torrentList.startTorrentingSummary(s.torrentKey))
+    .forEach((s) => controllers.torrentList().startTorrentingSummary(s.torrentKey))
 }

 // Set window dimensions to match video dimensions or fill the screen
@@ -383,7 +450,7 @@ function setDimensions (dimensions) {
  )

  ipcRenderer.send('setAspectRatio', aspectRatio)
-  ipcRenderer.send('setBounds', {contentBounds: true, x: null, y: null, width, height})
+  ipcRenderer.send('setBounds', { contentBounds: true, x: null, y: null, width, height })
  state.playing.aspectRatio = aspectRatio
 }

@@ -392,22 +459,29 @@ function setDimensions (dimensions) {
 function onOpen (files) {
  if (!Array.isArray(files)) files = [ files ]

+  // File API seems to transform "magnet:?foo" in "magnet:///?foo"
+  // this is a sanitization
+  files = files.map(file => {
+    if (typeof file !== 'string') return file
+    return file.replace(/^magnet:\/+\?/i, 'magnet:?')
+  })
+
  const url = state.location.url()
  const allTorrents = files.every(TorrentPlayer.isTorrent)
-  const allSubtitles = files.every(controllers.subtitles.isSubtitle)
+  const allSubtitles = files.every(controllers.subtitles().isSubtitle)

  if (allTorrents) {
    // Drop torrents onto the app: go to home screen, add torrents, no matter what
    dispatch('backToList')
    // All .torrent files? Add them.
-    files.forEach((file) => controllers.torrentList.addTorrent(file))
+    files.forEach((file) => controllers.torrentList().addTorrent(file))
  } else if (url === 'player' && allSubtitles) {
    // Drop subtitles onto a playing video: add subtitles
-    controllers.subtitles.addSubtitles(files, true)
+    controllers.subtitles().addSubtitles(files, true)
  } else if (url === 'home') {
    // Drop files onto home screen: show Create Torrent
    state.modal = null
-    controllers.torrentList.showCreateTorrent(files)
+    controllers.torrentList().showCreateTorrent(files)
  } else {
    // Drop files onto any other screen: show error
    return onError('Please go back to the torrent list before creating a new torrent.')
@@ -427,15 +501,11 @@ function onError (err) {
  update()
 }

-function onPaste (e) {
-  if (e.target.tagName.toLowerCase() === 'input') return
+const editableHtmlTags = new Set(['input', 'textarea'])

-  const torrentIds = electron.clipboard.readText().split('\n')
-  torrentIds.forEach(function (torrentId) {
-    torrentId = torrentId.trim()
-    if (torrentId.length === 0) return
-    controllers.torrentList.addTorrent(torrentId)
-  })
+function onPaste (e) {
+  if (editableHtmlTags.has(e.target.tagName.toLowerCase())) return
+  controllers.torrentList().addTorrent(electron.clipboard.readText())

  update()
 }
--- a/src/renderer/pages/app.js
+++ b/src/renderer/pages/app.js
@@ -1,32 +1,38 @@
 const colors = require('material-ui/styles/colors')
+const createGetter = require('fn-getter')
 const React = require('react')

 const darkBaseTheme = require('material-ui/styles/baseThemes/darkBaseTheme').default
-const lightBaseTheme = require('material-ui/styles/baseThemes/lightBaseTheme').default
 const getMuiTheme = require('material-ui/styles/getMuiTheme').default
 const MuiThemeProvider = require('material-ui/styles/MuiThemeProvider').default

 const Header = require('../components/header')

+// Perf optimization: Needed immediately, so do not lazy load it below
+const TorrentListPage = require('./torrent-list-page')
+
 const Views = {
-  'home': require('./torrent-list-page'),
-  'player': require('./player-page'),
-  'create-torrent': require('./create-torrent-page'),
-  'preferences': require('./preferences-page')
+  'home': createGetter(() => TorrentListPage),
+  'player': createGetter(() => require('./player-page')),
+  'create-torrent': createGetter(() => require('./create-torrent-page')),
+  'preferences': createGetter(() => require('./preferences-page'))
 }

 const Modals = {
-  'open-torrent-address-modal': require('../components/open-torrent-address-modal'),
-  'remove-torrent-modal': require('../components/remove-torrent-modal'),
-  'update-available-modal': require('../components/update-available-modal'),
-  'unsupported-media-modal': require('../components/unsupported-media-modal')
+  'open-torrent-address-modal': createGetter(
+    () => require('../components/open-torrent-address-modal')
+  ),
+  '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'))
 }

 const fontFamily = process.platform === 'win32'
  ? '"Segoe UI", sans-serif'
  : 'BlinkMacSystemFont, "Helvetica Neue", Helvetica, sans-serif'
-lightBaseTheme.fontFamily = fontFamily
+
 darkBaseTheme.fontFamily = fontFamily
+darkBaseTheme.userAgent = false
 darkBaseTheme.palette.primary1Color = colors.grey50
 darkBaseTheme.palette.primary2Color = colors.grey50
 darkBaseTheme.palette.primary3Color = colors.grey600
@@ -34,6 +40,9 @@ darkBaseTheme.palette.accent1Color = colors.redA200
 darkBaseTheme.palette.accent2Color = colors.redA400
 darkBaseTheme.palette.accent3Color = colors.redA100

+let darkMuiTheme
+let lightMuiTheme
+
 class App extends React.Component {
  render () {
    const state = this.props.state
@@ -53,8 +62,12 @@ class App extends React.Component {
    if (state.window.isFocused) cls.push('is-focused')
    if (hideControls) cls.push('hide-video-controls')

-    const vdom = (
-      <MuiThemeProvider muiTheme={getMuiTheme(darkBaseTheme)}>
+    if (!darkMuiTheme) {
+      darkMuiTheme = getMuiTheme(darkBaseTheme)
+    }
+
+    return (
+      <MuiThemeProvider muiTheme={darkMuiTheme}>
        <div className={'app ' + cls.join(' ')}>
          <Header state={state} />
          {this.getErrorPopover()}
@@ -63,8 +76,6 @@ class App extends React.Component {
        </div>
      </MuiThemeProvider>
    )
-
-    return vdom
  }

  getErrorPopover () {
@@ -88,9 +99,17 @@ class App extends React.Component {
  getModal () {
    const state = this.props.state
    if (!state.modal) return
-    const ModalContents = Modals[state.modal.id]
+
+    if (!lightMuiTheme) {
+      const lightBaseTheme = require('material-ui/styles/baseThemes/lightBaseTheme').default
+      lightBaseTheme.fontFamily = fontFamily
+      lightBaseTheme.userAgent = false
+      lightMuiTheme = getMuiTheme(lightBaseTheme)
+    }
+
+    const ModalContents = Modals[state.modal.id]()
    return (
-      <MuiThemeProvider muiTheme={getMuiTheme(lightBaseTheme)}>
+      <MuiThemeProvider muiTheme={lightMuiTheme}>
        <div key='modal' className='modal'>
          <div key='modal-background' className='modal-background' />
          <div key='modal-content' className='modal-content'>
@@ -103,7 +122,7 @@ class App extends React.Component {

  getView () {
    const state = this.props.state
-    const View = Views[state.location.url()]
+    const View = Views[state.location.url()]()
    return (<View state={state} />)
  }
 }
--- a/src/renderer/pages/create-torrent-page.js
+++ b/src/renderer/pages/create-torrent-page.js
@@ -3,7 +3,7 @@ const path = require('path')
 const prettyBytes = require('prettier-bytes')
 const React = require('react')

-const {dispatch, dispatcher} = require('../lib/dispatcher')
+const { dispatch, dispatcher } = require('../lib/dispatcher')

 const FlatButton = require('material-ui/FlatButton').default
 const RaisedButton = require('material-ui/RaisedButton').default
@@ -35,7 +35,7 @@ class CreateTorrentPage extends React.Component {
    // Then, exclude .DS_Store and other dotfiles
    const files = info.files
      .filter((f) => !containsDots(f.path, pathPrefix))
-      .map((f) => ({name: f.name, path: f.path, size: f.size}))
+      .map((f) => ({ name: f.name, path: f.path, size: f.size }))
    if (files.length === 0) return (<CreateTorrentErrorPage state={state} />)

    // Then, use the name of the base folder (or sole file, for a single file torrent)
@@ -65,9 +65,9 @@ class CreateTorrentPage extends React.Component {
    }

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

@@ -106,7 +106,7 @@ class CreateTorrentPage extends React.Component {
            }}
            onClick={dispatcher('cancel')} />
          <RaisedButton
-            className='control create-torrent'
+            className='control create-torrent-button'
            label='Create Torrent'
            primary
            onClick={this.handleSubmit} />
@@ -141,7 +141,7 @@ class CreateTorrentPage extends React.Component {
          <label>Private:</label>
          <Checkbox
            className='torrent-is-private control'
-            style={{display: ''}}
+            style={{ display: '' }}
            checked={this.state.isPrivate}
            onCheck={this.setIsPrivate} />
        </div>
@@ -191,9 +191,14 @@ function handleSubmit () {
    path: this.state.basePath,
    files: this.state.files,
    announce: announceList,
-    private: this.state.isPrivate,
    comment: this.state.comment.trim()
  }
+
+  // If torrent is not private, leave private flag unset. This ensures that
+  // the torrent info hash will match the result generated by other tools,
+  // including webtorrent-cli.
+  if (this.state.isPrivate) options.private = true
+
  dispatch('createTorrent', options)
 }

--- a/src/renderer/pages/player-page.js
+++ b/src/renderer/pages/player-page.js
@@ -5,7 +5,7 @@ const zeroFill = require('zero-fill')

 const TorrentSummary = require('../lib/torrent-summary')
 const Playlist = require('../lib/playlist')
-const {dispatch, dispatcher} = require('../lib/dispatcher')
+const { dispatch, dispatcher } = require('../lib/dispatcher')
 const config = require('../../config')

 // Shows a streaming video player. Standard features + Chromecast + Airplay
@@ -160,6 +160,7 @@ function renderMedia (state) {
    } else {
      // When the last video completes, pause the video instead of looping
      state.playing.isPaused = true
+      if (state.window.isFullScreen) dispatch('toggleFullScreen')
    }
  }

@@ -203,28 +204,41 @@ function renderOverlay (state) {
  )
 }

+/**
+ * Render track or disk number string
+ * @param common metadata.common part
+ * @param key should be either 'track' or 'disk'
+ * @return track or disk number metadata as JSX block
+ */
+function renderTrack (common, key) {
+  // Audio metadata: track-number
+  if (common[key] && common[key].no) {
+    let str = `${common[key].no}`
+    if (common[key].of) {
+      str += ` of ${common[key].of}`
+    }
+    const style = { textTransform: 'capitalize' }
+    return (
+      <div className={`audio-${key}`}>
+        <label style={style}>{key}</label> {str}
+      </div>
+    )
+  }
+}
+
 function renderAudioMetadata (state) {
  const fileSummary = state.getPlayingFileSummary()
  if (!fileSummary.audioInfo) return
-  const info = fileSummary.audioInfo
+  const common = fileSummary.audioInfo.common || {}

  // Get audio track info
-  let title = info.title
-  if (!title) {
-    title = fileSummary.name
-  }
-  let artist = info.artist && info.artist[0]
-  let album = info.album
-  if (album && info.year && !album.includes(info.year)) {
-    album += ' (' + info.year + ')'
-  }
-  let track
-  if (info.track && info.track.no && info.track.of) {
-    track = info.track.no + ' of ' + info.track.of
-  }
+  const title = common.title ? common.title : fileSummary.name

  // Show a small info box in the middle of the screen with title/album/etc
  const elems = []
+
+  // Audio metadata: artist(s)
+  const artist = common.artist || common.albumartist
  if (artist) {
    elems.push((
      <div key='artist' className='audio-artist'>
@@ -232,17 +246,86 @@ function renderAudioMetadata (state) {
      </div>
    ))
  }
-  if (album) {
+
+  // Audio metadata: disk & track-number
+  const count = ['track', 'disk']
+  count.forEach(key => {
+    const nrElem = renderTrack(common, key)
+    if (nrElem) {
+      elems.push(nrElem)
+    }
+  })
+
+  // Audio metadata: album
+  if (common.album) {
    elems.push((
      <div key='album' className='audio-album'>
-        <label>Album</label>{album}
+        <label>Album</label>{common.album}
      </div>
    ))
  }
-  if (track) {
+
+  // Audio metadata: year
+  if (common.year) {
    elems.push((
-      <div key='track' className='audio-track'>
-        <label>Track</label>{track}
+      <div key='year' className='audio-year'>
+        <label>Year</label>{common.year}
+      </div>
+    ))
+  }
+
+  // Audio metadata: release information (label & catalog-number)
+  if (common.label || common.catalognumber) {
+    const releaseInfo = []
+    if (common.label && common.catalognumber &&
+      common.label.length === common.catalognumber.length) {
+      // Assume labels & catalog-numbers are pairs
+      for (let n = 0; n < common.label.length; ++n) {
+        releaseInfo.push(common.label[0] + ' / ' + common.catalognumber[n])
+      }
+    } else {
+      if (common.label) {
+        releaseInfo.push(...common.label)
+      }
+      if (common.catalognumber) {
+        releaseInfo.push(...common.catalognumber)
+      }
+    }
+    elems.push((
+      <div key='release' className='audio-release'>
+        <label>Release</label>{ releaseInfo.join(', ') }
+      </div>
+    ))
+  }
+
+  // Audio metadata: format
+  const format = []
+  fileSummary.audioInfo.format = fileSummary.audioInfo.format || ''
+  if (fileSummary.audioInfo.format.dataformat) {
+    format.push(fileSummary.audioInfo.format.dataformat)
+  }
+  if (fileSummary.audioInfo.format.bitrate) {
+    format.push(Math.round(fileSummary.audioInfo.format.bitrate / 1000) + ' kbps') // 128 kbps
+  }
+  if (fileSummary.audioInfo.format.sampleRate) {
+    format.push(Math.round(fileSummary.audioInfo.format.sampleRate / 100) / 10 + ' kHz') // 44.1 kHz
+  }
+  if (fileSummary.audioInfo.format.bitsPerSample) {
+    format.push(fileSummary.audioInfo.format.bitsPerSample + ' bit')
+  }
+  if (format.length > 0) {
+    elems.push((
+      <div key='format' className='audio-format'>
+        <label>Format</label>{ format.join(', ') }
+      </div>
+    ))
+  }
+
+  // Audio metadata: comments
+  if (common.comment) {
+    elems.push((
+      <div key='comments' className='audio-comments'>
+        <label>Comments</label>{common.comment.join(' / ')}
      </div>
    ))
  }
@@ -273,11 +356,11 @@ function renderLoadingSpinner (state) {

  return (
    <div key='loading' className='media-stalled'>
-      <div key='loading-spinner' className='loading-spinner'>&nbsp;</div>
+      <div key='loading-spinner' className='loading-spinner' />
      <div key='loading-progress' className='loading-status ellipsis'>
-        <span className='progress'>{fileProgress}%</span> downloaded,
-        <span>↓ {prettyBytes(prog.downloadSpeed || 0)}/s</span>
-        <span>↑ {prettyBytes(prog.uploadSpeed || 0)}/s</span>
+        <span className='progress'>{fileProgress}%</span> downloaded
+        <span> ↓ {prettyBytes(prog.downloadSpeed || 0)}/s</span>
+        <span> ↑ {prettyBytes(prog.uploadSpeed || 0)}/s</span>
      </div>
    </div>
  )
@@ -303,7 +386,7 @@ function renderCastScreen (state) {
    isCast = false
  } else if (state.playing.location === 'error') {
    castIcon = 'error_outline'
-    castType = 'Error'
+    castType = 'Unable to Play'
    isCast = false
  }

@@ -333,7 +416,7 @@ function renderCastScreen (state) {
 function renderCastOptions (state) {
  if (!state.devices.castMenu) return

-  const {location, devices} = state.devices.castMenu
+  const { location, devices } = state.devices.castMenu
  const player = state.devices[location]

  const items = devices.map(function (device, ix) {
@@ -456,9 +539,9 @@ function renderPlayerControls (state) {

  // Add the cast buttons. Icons for each cast type, connected/disconnected:
  const buttonIcons = {
-    'chromecast': {true: 'cast_connected', false: 'cast'},
-    'airplay': {true: 'airplay', false: 'airplay'},
-    'dlna': {true: 'tv', false: 'tv'}
+    'chromecast': { true: 'cast_connected', false: 'cast' },
+    'airplay': { true: 'airplay', false: 'airplay' },
+    'dlna': { true: 'tv', false: 'tv' }
  }
  castTypes.forEach(function (castType) {
    // Do we show this button (eg. the Chromecast button) at all?
@@ -497,9 +580,9 @@ function renderPlayerControls (state) {
  const volume = state.playing.volume
  const volumeIcon = 'volume_' + (
    volume === 0 ? 'off'
-    : volume < 0.3 ? 'mute'
-    : volume < 0.6 ? 'down'
-    : 'up')
+      : volume < 0.3 ? 'mute'
+        : volume < 0.6 ? 'down'
+          : 'up')
  const volumeStyle = {
    background: '-webkit-gradient(linear, left top, right top, ' +
      'color-stop(' + (volume * 100) + '%, #eee), ' +
@@ -523,8 +606,8 @@ function renderPlayerControls (state) {
  ))

  // Show video playback progress
-  const currentTimeStr = formatTime(state.playing.currentTime)
-  const durationStr = formatTime(state.playing.duration)
+  const currentTimeStr = formatTime(state.playing.currentTime, state.playing.duration)
+  const durationStr = formatTime(state.playing.duration, state.playing.duration)
  elements.push((
    <span key='time' className='time float-left'>
      {currentTimeStr} / {durationStr}
@@ -599,18 +682,21 @@ function renderLoadingBar (state) {

  const torrentSummary = state.getPlayingTorrentSummary()
  if (!torrentSummary.progress) {
-    return []
+    return null
  }

  // Find all contiguous parts of the torrent which are loaded
  const prog = torrentSummary.progress
  const fileProg = prog.files[state.playing.fileIndex]
+
+  if (!fileProg) return null
+
  const parts = []
  let lastPiecePresent = false
  for (let i = fileProg.startPiece; i <= fileProg.endPiece; i++) {
    const partPresent = Bitfield.prototype.get.call(prog.bitfield, i)
    if (partPresent && !lastPiecePresent) {
-      parts.push({start: i - fileProg.startPiece, count: 1})
+      parts.push({ start: i - fileProg.startPiece, count: 1 })
    } else if (partPresent) {
      parts[parts.length - 1].count++
    }
@@ -626,6 +712,7 @@ function renderLoadingBar (state) {

    return (<div key={i} className='loading-bar-part' style={style} />)
  })
+
  return (<div key='loading-bar' className='loading-bar'>{loadingBarElems}</div>)
 }

@@ -642,17 +729,19 @@ function cssBackgroundImageDarkGradient () {
    'rgba(0,0,0,0.4) 0%, rgba(0,0,0,1) 100%)'
 }

-function formatTime (time) {
+function formatTime (time, total) {
  if (typeof time !== 'number' || Number.isNaN(time)) {
    return '0:00'
  }

+  let totalHours = Math.floor(total / 3600)
+  let totalMinutes = Math.floor(total % 3600 / 60)
  let hours = Math.floor(time / 3600)
  let minutes = Math.floor(time % 3600 / 60)
-  if (hours > 0) {
+  if (totalMinutes > 9) {
    minutes = zeroFill(2, minutes)
  }
  let seconds = zeroFill(2, Math.floor(time % 60))

-  return (hours > 0 ? hours + ':' : '') + minutes + ':' + seconds
+  return (totalHours > 0 ? hours + ':' : '') + minutes + ':' + seconds
 }
--- a/src/renderer/pages/preferences-page.js
+++ b/src/renderer/pages/preferences-page.js
@@ -7,7 +7,7 @@ const RaisedButton = require('material-ui/RaisedButton').default
 const Heading = require('../components/heading')
 const PathSelector = require('../components/path-selector')

-const {dispatch} = require('../lib/dispatcher')
+const { dispatch } = require('../lib/dispatcher')
 const config = require('../../config')

 class PreferencesPage extends React.Component {
@@ -37,7 +37,7 @@ class PreferencesPage extends React.Component {
          }}
          onChange={this.handleDownloadPathChange}
          title='Download location'
-          value={this.props.state.unsaved.prefs.downloadPath} />
+          value={this.props.state.saved.prefs.downloadPath} />
      </Preference>
    )
  }
@@ -51,7 +51,7 @@ class PreferencesPage extends React.Component {
      <Preference>
        <Checkbox
          className='control'
-          checked={!this.props.state.unsaved.prefs.openExternalPlayer}
+          checked={!this.props.state.saved.prefs.openExternalPlayer}
          label={'Play torrent media files using WebTorrent'}
          onCheck={this.handleOpenExternalPlayerChange} />
      </Preference>
@@ -62,11 +62,29 @@ class PreferencesPage extends React.Component {
    dispatch('updatePreferences', 'openExternalPlayer', !isChecked)
  }

+  highestPlaybackPriorityCheckbox () {
+    return (
+      <Preference>
+        <Checkbox
+          className='control'
+          checked={this.props.state.saved.prefs.highestPlaybackPriority}
+          label={'Highest Playback Priority'}
+          onCheck={this.handleHighestPlaybackPriorityChange}
+        />
+        <p>Pauses all active torrents to allow playback to use all of the available bandwidth.</p>
+      </Preference>
+    )
+  }
+
+  handleHighestPlaybackPriorityChange (e, isChecked) {
+    dispatch('updatePreferences', 'highestPlaybackPriority', isChecked)
+  }
+
  externalPlayerPathSelector () {
-    const playerPath = this.props.state.unsaved.prefs.externalPlayerPath
+    const playerPath = this.props.state.saved.prefs.externalPlayerPath
    const playerName = this.props.state.getExternalPlayerName()

-    const description = this.props.state.unsaved.prefs.openExternalPlayer
+    const description = this.props.state.saved.prefs.openExternalPlayer
      ? `Torrent media files will always play in ${playerName}.`
      : `Torrent media files will play in ${playerName} if WebTorrent cannot play them.`

@@ -90,8 +108,61 @@ class PreferencesPage extends React.Component {
    dispatch('updatePreferences', 'externalPlayerPath', filePath)
  }

+  autoAddTorrentsCheckbox () {
+    return (
+      <Preference>
+        <Checkbox
+          className='control'
+          checked={this.props.state.saved.prefs.autoAddTorrents}
+          label={'Watch for new .torrent files and add them immediately'}
+          onCheck={(e, value) => { this.handleAutoAddTorrentsChange(e, value) }}
+        />
+      </Preference>
+    )
+  }
+
+  handleAutoAddTorrentsChange (e, isChecked) {
+    const torrentsFolderPath = this.props.state.saved.prefs.torrentsFolderPath
+    if (isChecked && !torrentsFolderPath) {
+      alert('Select a torrents folder first.') // eslint-disable-line
+      e.preventDefault()
+      return
+    }
+
+    dispatch('updatePreferences', 'autoAddTorrents', isChecked)
+
+    if (isChecked) {
+      dispatch('startFolderWatcher', null)
+      return
+    }
+
+    dispatch('stopFolderWatcher', null)
+  }
+
+  torrentsFolderPathSelector () {
+    const torrentsFolderPath = this.props.state.saved.prefs.torrentsFolderPath
+
+    return (
+      <Preference>
+        <PathSelector
+          dialog={{
+            title: 'Select folder to watch for new torrents',
+            properties: [ 'openDirectory' ]
+          }}
+          displayValue={torrentsFolderPath || ''}
+          onChange={this.handletorrentsFolderPathChange}
+          title='Folder to watch'
+          value={torrentsFolderPath ? path.dirname(torrentsFolderPath) : null} />
+      </Preference>
+    )
+  }
+
+  handletorrentsFolderPathChange (filePath) {
+    dispatch('updatePreferences', 'torrentsFolderPath', filePath)
+  }
+
  setDefaultAppButton () {
-    const isFileHandler = this.props.state.unsaved.prefs.isFileHandler
+    const isFileHandler = this.props.state.saved.prefs.isFileHandler
    if (isFileHandler) {
      return (
        <Preference>
@@ -124,7 +195,7 @@ class PreferencesPage extends React.Component {
        <Preference>
          <Checkbox
            className='control'
-            checked={this.props.state.unsaved.prefs.startup}
+            checked={this.props.state.saved.prefs.startup}
            label={'Open WebTorrent on startup.'}
            onCheck={this.handleStartupChange}
          />
@@ -145,12 +216,15 @@ class PreferencesPage extends React.Component {
    }
    return (
      <div style={style}>
-        <PreferencesSection title='Downloads'>
+        <PreferencesSection title='Folders'>
          {this.downloadPathSelector()}
+          {this.autoAddTorrentsCheckbox()}
+          {this.torrentsFolderPathSelector()}
        </PreferencesSection>
        <PreferencesSection title='Playback'>
          {this.openExternalPlayerCheckbox()}
          {this.externalPlayerPathSelector()}
+          {this.highestPlaybackPriorityCheckbox()}
        </PreferencesSection>
        <PreferencesSection title='Default torrent app'>
          {this.setDefaultAppButton()}
--- a/src/renderer/pages/torrent-list-page.js
+++ b/src/renderer/pages/torrent-list-page.js
@@ -1,12 +1,12 @@
 const React = require('react')
 const prettyBytes = require('prettier-bytes')
+
 const Checkbox = require('material-ui/Checkbox').default
 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 {InvalidTorrentError} = require('../lib/errors')
+const { dispatcher, dispatch } = require('../lib/dispatcher')

 module.exports = class TorrentList extends React.Component {
  render () {
@@ -59,7 +59,7 @@ module.exports = class TorrentList extends React.Component {
    const classes = ['torrent']
    if (isSelected) classes.push('selected')
    if (!infoHash) classes.push('disabled')
-    if (!torrentSummary.torrentKey) throw new InvalidTorrentError('Missing torrentKey')
+    if (!torrentSummary.torrentKey) throw new Error('Missing torrentKey')
    return (
      <div
        id={torrentSummary.testID && ('torrent-' + torrentSummary.testID)}
@@ -119,9 +119,15 @@ module.exports = class TorrentList extends React.Component {
      return (
        <Checkbox
          key='download-button'
-          className={'download ' + torrentSummary.status}
-          style={{display: 'inline-block', width: '32px'}}
-          iconStyle={{width: '20px', height: '20px'}}
+          className={'control download ' + torrentSummary.status}
+          style={{
+            display: 'inline-block',
+            width: 32
+          }}
+          iconStyle={{
+            width: 20,
+            height: 20
+          }}
          checked={isActive}
          onClick={stopPropagation}
          onCheck={dispatcher('toggleTorrent', infoHash)} />
@@ -133,11 +139,11 @@ module.exports = class TorrentList extends React.Component {
      const styles = {
        wrapper: {
          display: 'inline-block',
-          marginRight: '8px'
+          marginRight: 8
        },
        progress: {
-          height: '8px',
-          width: '30px'
+          height: 8,
+          width: 30
        }
      }
      return (
@@ -210,7 +216,7 @@ module.exports = class TorrentList extends React.Component {
      } else { // torrentSummary.status is 'new' or something unexpected
        status = ''
      }
-      return (<span>{status}</span>)
+      return (<span key='torrent-status'>{status}</span>)
    }
  }

@@ -359,8 +365,8 @@ module.exports = class TorrentList extends React.Component {

  renderRadialProgressBar (fraction, cssClass) {
    const rotation = 360 * fraction
-    const transformFill = {transform: 'rotate(' + (rotation / 2) + 'deg)'}
-    const transformFix = {transform: 'rotate(' + rotation + 'deg)'}
+    const transformFill = { transform: 'rotate(' + (rotation / 2) + 'deg)' }
+    const transformFix = { transform: 'rotate(' + rotation + 'deg)' }

    return (
      <div key='radial-progress' className={'radial-progress ' + cssClass}>
@@ -388,10 +394,20 @@ function getErrorMessage (torrentSummary) {
  if (err === 'path-missing') {
    return (
      <span>
-        Path missing.<br />
-        Fix and restart the app, or delete the torrent.
+        Torrent data missing.<br />
+        Fix or click to
+        <a onClick={(e) => {
+          e.stopPropagation()
+          restartTorrent(torrentSummary)
+        }}>re-download torrent</a>.
      </span>
    )
  }
  return 'Error'
 }
+
+function restartTorrent (summary) {
+  delete summary.path
+  delete summary.error
+  dispatch('startTorrentingSummary', summary.torrentKey)
+}
--- a/src/renderer/webtorrent.js
+++ b/src/renderer/webtorrent.js
@@ -6,8 +6,9 @@ const crypto = require('crypto')
 const deepEqual = require('deep-equal')
 const defaultAnnounceList = require('create-torrent').announceList
 const electron = require('electron')
-const fs = require('fs-extra')
-const musicmetadata = require('musicmetadata')
+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')
@@ -15,7 +16,7 @@ const zeroFill = require('zero-fill')

 const crashReporter = require('../crash-reporter')
 const config = require('../config')
-const {TorrentKeyNotFoundError} = require('./lib/errors')
+const { TorrentKeyNotFoundError } = require('./lib/errors')
 const torrentPoster = require('./lib/torrent-poster')

 // Report when the process crashes
@@ -96,8 +97,8 @@ function init () {
  ipc.send('ipcReadyWebTorrent')

  window.addEventListener('error', (e) =>
-    ipc.send('wt-uncaught-error', {message: e.error.message, stack: e.error.stack}),
-    true)
+    ipc.send('wt-uncaught-error', { message: e.error.message, stack: e.error.stack }),
+  true)

  setInterval(updateTorrentProgress, 1000)
  console.timeEnd('init')
@@ -124,11 +125,10 @@ function startTorrenting (torrentKey, torrentID, path, fileModtimes, selections)

  // Only download the files the user wants, not necessarily all files
  torrent.once('ready', () => selectFiles(torrent, selections))
-
-  return torrent
 }

 function stopTorrenting (infoHash) {
+  console.log('--- STOP TORRENTING: ', infoHash)
  const torrent = client.get(infoHash)
  if (torrent) torrent.destroy()
 }
@@ -203,19 +203,22 @@ function getTorrentFileInfo (file) {
  }
 }

-// Every time we resolve a magnet URI, save the torrent file so that we never
-// have to download it again. Never ask the DHT the same question twice.
+// Every time we resolve a magnet URI, save the torrent file so that we can use
+// it on next startup. Starting with the full torrent metadata will be faster
+// than re-fetching it from peers using ut_metadata.
 function saveTorrentFile (torrentKey) {
  const torrent = getTorrent(torrentKey)
-  checkIfTorrentFileExists(torrent.infoHash, function (torrentPath, exists) {
+  const torrentPath = path.join(config.TORRENT_PATH, torrent.infoHash + '.torrent')
+
+  fs.access(torrentPath, fs.constants.R_OK, function (err) {
    const fileName = torrent.infoHash + '.torrent'
-    if (exists) {
+    if (!err) {
      // We've already saved the file
      return ipc.send('wt-file-saved', torrentKey, fileName)
    }

    // Otherwise, save the .torrent file, under the app config folder
-    fs.mkdir(config.TORRENT_PATH, function (_) {
+    mkdirp(config.TORRENT_PATH, function (_) {
      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)
@@ -225,15 +228,6 @@ function saveTorrentFile (torrentKey) {
  })
 }

-// Checks whether we've already resolved a given infohash to a torrent file
-// Calls back with (torrentPath, exists). Logs, does not call back on error
-function checkIfTorrentFileExists (infoHash, cb) {
-  const torrentPath = path.join(config.TORRENT_PATH, infoHash + '.torrent')
-  fs.exists(torrentPath, function (exists) {
-    cb(torrentPath, exists)
-  })
-}
-
 // Save a JPG that represents a torrent.
 // Auto chooses either a frame from a video file, an image, etc
 function generateTorrentPoster (torrentKey) {
@@ -241,7 +235,7 @@ function generateTorrentPoster (torrentKey) {
  torrentPoster(torrent, function (err, buf, extension) {
    if (err) return console.log('error generating poster: %o', err)
    // save it for next time
-    fs.mkdirp(config.POSTER_PATH, function (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)
@@ -257,7 +251,7 @@ function generateTorrentPoster (torrentKey) {
 function updateTorrentProgress () {
  const progress = getTorrentProgress()
  // TODO: diff torrent-by-torrent, not once for the whole update
-  if (prevProgress && deepEqual(progress, prevProgress, {strict: true})) {
+  if (prevProgress && deepEqual(progress, prevProgress, { strict: true })) {
    return /* don't send heavy object if it hasn't changed */
  }
  ipc.send('wt-progress', progress)
@@ -326,7 +320,8 @@ function startServerFromReadyTorrent (torrent, cb) {
    const info = {
      torrentKey: torrent.key,
      localURL: 'http://localhost' + urlSuffix,
-      networkURL: 'http://' + networkAddress() + urlSuffix
+      networkURL: 'http://' + networkAddress() + urlSuffix,
+      networkAddress: networkAddress()
    }

    ipc.send('wt-server-running', info)
@@ -340,16 +335,34 @@ function stopServer () {
  server = null
 }

+console.log('Initializing...')
+
 function getAudioMetadata (infoHash, index) {
  const torrent = client.get(infoHash)
  const file = torrent.files[index]
-  musicmetadata(file.createReadStream(), function (err, info) {
-    if (err) return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
-    const { artist, album, albumartist, title, year, track, disk, genre } = info
-    const importantInfo = { artist, album, albumartist, title, year, track, disk, genre }
-    console.log('got audio metadata for %s: %o', file.name, importantInfo)
-    ipc.send('wt-audio-metadata', infoHash, index, importantInfo)
-  })
+
+  // Set initial matadata to display the filename first.
+  const metadata = { title: file.name }
+  ipc.send('wt-audio-metadata', infoHash, index, metadata)
+
+  const options = { native: false,
+    skipCovers: true,
+    fileSize: file.length,
+    observer: event => {
+      ipc.send('wt-audio-metadata', infoHash, index, event.metadata)
+    } }
+  const onMetaData = file.done
+    // If completed; use direct file access
+    ? mm.parseFile(path.join(torrent.path, file.path), options)
+    // otherwise stream
+    : mm.parseStream(file.createReadStream(), file.name, options)
+
+  onMetaData
+    .then(() => {
+      console.log(`metadata for file='${file.name}' completed.`)
+    }).catch(function (err) {
+      return console.log('error getting audio metadata for ' + infoHash + ':' + index, err)
+    })
 }

 function selectFiles (torrentOrInfoHash, selections) {
--- a/static/main.css
+++ b/static/main.css
@@ -615,6 +615,7 @@ body.drag .app::after {
  font-size: 13px;
  margin: 9px 8px 8px 8px;
  opacity: 0.8;
+  font-variant-numeric: tabular-nums;
 }

 .player .controls .icon.closed-caption {
@@ -800,6 +801,23 @@ video::-webkit-media-text-track-container {
  width: 40px;
  height: 40px;
  margin: 40px auto;
+  border-top: 6px solid rgba(255, 255, 255, 0.2);
+  border-right: 6px solid rgba(255, 255, 255, 0.2);
+  border-bottom: 6px solid rgba(255, 255, 255, 0.2);
+  border-left: 6px solid #ffffff;
+  border-radius: 50%;
+  color: transparent;
+  animation: spinning 1.1s infinite linear;
+}
+
+@keyframes spinning {
+  0% {
+    transform: rotate(0deg);
+  }
+
+  100% {
+    transform: rotate(360deg);
+  }
 }

 .media-stalled .loading-status {
@@ -819,12 +837,17 @@ video::-webkit-media-text-track-container {

 .audio-metadata label {
  display:inline-block;
-  width: 100px;
+  width: 120px;
  text-align: right;
  font-weight: normal;
  margin-right: 25px;
 }

+.audio-metadata .audio-format,
+.audio-metadata .audio-comments {
+  font-weight: normal;
+}
+
 /*
 * ERRORS
 */
--- a/static/wiredCd.torrent
+++ b/static/wiredCd.torrent
--- a/test/index.js
+++ b/test/index.js
@@ -10,7 +10,7 @@ test('app runs', function (t) {
  setup.waitForLoad(app, t)
    .then(() => setup.screenshotCreateOrCompare(app, t, 'app-basic'))
    .then(() => setup.endTest(app, t),
-          (err) => setup.endTest(app, t, err || 'error'))
+      (err) => setup.endTest(app, t, err || 'error'))
 })

 require('./test-torrent-list')
--- a/test/screenshots/darwin/add-torrent-0-percent.png
+++ b/test/screenshots/darwin/add-torrent-0-percent.png
--- a/test/screenshots/darwin/add-torrent-100-percent.png
+++ b/test/screenshots/darwin/add-torrent-100-percent.png
--- a/test/screenshots/darwin/app-basic.png
+++ b/test/screenshots/darwin/app-basic.png
--- a/test/screenshots/darwin/create-torrent-100-percent.png
+++ b/test/screenshots/darwin/create-torrent-100-percent.png
--- a/test/screenshots/darwin/create-torrent-advanced.png
+++ b/test/screenshots/darwin/create-torrent-advanced.png
--- a/test/screenshots/darwin/create-torrent-simple.png
+++ b/test/screenshots/darwin/create-torrent-simple.png
--- a/test/screenshots/darwin/play-torrent-bbb.png
+++ b/test/screenshots/darwin/play-torrent-bbb.png
--- a/test/screenshots/darwin/play-torrent-return.png
+++ b/test/screenshots/darwin/play-torrent-return.png
--- a/test/screenshots/darwin/play-torrent-wired-2.png
+++ b/test/screenshots/darwin/play-torrent-wired-2.png
--- a/test/screenshots/darwin/play-torrent-wired-3.png
+++ b/test/screenshots/darwin/play-torrent-wired-3.png
--- a/test/screenshots/darwin/play-torrent-wired-4.png
+++ b/test/screenshots/darwin/play-torrent-wired-4.png
--- a/test/screenshots/darwin/play-torrent-wired-5.png
+++ b/test/screenshots/darwin/play-torrent-wired-5.png
--- a/test/screenshots/darwin/play-torrent-wired-fullscreen.png
+++ b/test/screenshots/darwin/play-torrent-wired-fullscreen.png
--- a/test/screenshots/darwin/play-torrent-wired-list.png
+++ b/test/screenshots/darwin/play-torrent-wired-list.png
--- a/test/screenshots/darwin/play-torrent-wired.png
+++ b/test/screenshots/darwin/play-torrent-wired.png
--- a/test/screenshots/darwin/prefs-basic.png
+++ b/test/screenshots/darwin/prefs-basic.png
--- a/test/screenshots/darwin/torrent-list-cosmos-delete-data.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-delete-data.png
--- a/test/screenshots/darwin/torrent-list-cosmos-deleted.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-deleted.png
--- a/test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-expand-deselect.png
--- a/test/screenshots/darwin/torrent-list-cosmos-expand-start.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-expand-start.png
--- a/test/screenshots/darwin/torrent-list-cosmos-expand.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-expand.png
--- a/test/screenshots/darwin/torrent-list-cosmos-hover.png
+++ b/test/screenshots/darwin/torrent-list-cosmos-hover.png
--- a/test/screenshots/darwin/torrent-list-delete-prompt.png
+++ b/test/screenshots/darwin/torrent-list-delete-prompt.png
--- a/test/screenshots/darwin/torrent-list-delete.png
+++ b/test/screenshots/darwin/torrent-list-delete.png
--- a/test/screenshots/darwin/torrent-list-deleted.png
+++ b/test/screenshots/darwin/torrent-list-deleted.png
--- a/test/screenshots/darwin/torrent-list-download-path-missing.png
+++ b/test/screenshots/darwin/torrent-list-download-path-missing.png
--- a/test/screenshots/darwin/torrent-list-download.png
+++ b/test/screenshots/darwin/torrent-list-download.png
--- a/Show More
+++ b/Show More