diff --git a/src/renderer/components/header.js b/src/renderer/components/header.js
index 9eb748a8..4210424a 100644
--- a/src/renderer/components/header.js
+++ b/src/renderer/components/header.js
@@ -10,19 +10,22 @@ class Header extends React.Component {
         className='header'
         onMouseMove={dispatcher('mediaMouseMoved')}
         onMouseEnter={dispatcher('mediaControlsMouseEnter')}
-        onMouseLeave={dispatcher('mediaControlsMouseLeave')}>
+        onMouseLeave={dispatcher('mediaControlsMouseLeave')}
+      >
         {this.getTitle()}
         <div className='nav left float-left'>
           <i
             className={'icon back ' + (loc.hasBack() ? '' : 'disabled')}
             title='Back'
-            onClick={dispatcher('back')}>
+            onClick={dispatcher('back')}
+          >
             chevron_left
           </i>
           <i
             className={'icon forward ' + (loc.hasForward() ? '' : 'disabled')}
             title='Forward'
-            onClick={dispatcher('forward')}>
+            onClick={dispatcher('forward')}
+          >
             chevron_right
           </i>
         </div>
@@ -46,7 +49,8 @@ class Header extends React.Component {
       <i
         className='icon add'
         title='Add torrent'
-        onClick={dispatcher('openFiles')}>
+        onClick={dispatcher('openFiles')}
+      >
         add
       </i>
     )
diff --git a/src/renderer/components/modal-ok-cancel.js b/src/renderer/components/modal-ok-cancel.js
index 25a2852e..52f4b40f 100644
--- a/src/renderer/components/modal-ok-cancel.js
+++ b/src/renderer/components/modal-ok-cancel.js
@@ -12,13 +12,15 @@ module.exports = class ModalOKCancel extends React.Component {
           className='control cancel'
           style={cancelStyle}
           label={cancelText}
-          onClick={onCancel} />
+          onClick={onCancel}
+        />
         <RaisedButton
           className='control ok'
           primary
           label={okText}
           onClick={onOK}
-          autoFocus />
+          autoFocus
+        />
       </div>
     )
   }
diff --git a/src/renderer/components/open-torrent-address-modal.js b/src/renderer/components/open-torrent-address-modal.js
index 708a1a7b..01cb5a04 100644
--- a/src/renderer/components/open-torrent-address-modal.js
+++ b/src/renderer/components/open-torrent-address-modal.js
@@ -15,13 +15,15 @@ module.exports = class OpenTorrentAddressModal extends React.Component {
             className='control'
             ref={(c) => { this.torrentURL = c }}
             fullWidth
-            onKeyDown={handleKeyDown.bind(this)} />
+            onKeyDown={handleKeyDown.bind(this)}
+          />
         </div>
         <ModalOKCancel
           cancelText='CANCEL'
           onCancel={dispatcher('exitModal')}
           okText='OK'
-          onOK={handleOK.bind(this)} />
+          onOK={handleOK.bind(this)}
+        />
       </div>
     )
   }
diff --git a/src/renderer/components/path-selector.js b/src/renderer/components/path-selector.js
index deea3402..51c89430 100644
--- a/src/renderer/components/path-selector.js
+++ b/src/renderer/components/path-selector.js
@@ -78,10 +78,12 @@ class PathSelector extends React.Component {
         </div>
         <TextField
           className='control' disabled id={id} value={text}
-          inputStyle={textareaStyle} style={textFieldStyle} />
+          inputStyle={textareaStyle} style={textFieldStyle}
+        />
         <RaisedButton
           className='control' label='Change' onClick={this.handleClick}
-          style={buttonStyle} />
+          style={buttonStyle}
+        />
       </div>
     )
   }
diff --git a/src/renderer/components/remove-torrent-modal.js b/src/renderer/components/remove-torrent-modal.js
index eab8e1eb..4913f59d 100644
--- a/src/renderer/components/remove-torrent-modal.js
+++ b/src/renderer/components/remove-torrent-modal.js
@@ -18,7 +18,8 @@ module.exports = class RemoveTorrentModal extends React.Component {
           cancelText='CANCEL'
           onCancel={dispatcher('exitModal')}
           okText={buttonText}
-          onOK={handleRemove} />
+          onOK={handleRemove}
+        />
       </div>
     )
 
diff --git a/src/renderer/components/show-more.js b/src/renderer/components/show-more.js
index 1ddb44d4..d26de36f 100644
--- a/src/renderer/components/show-more.js
+++ b/src/renderer/components/show-more.js
@@ -45,7 +45,8 @@ class ShowMore extends React.Component {
         <RaisedButton
           className='control'
           onClick={this.handleClick}
-          label={label} />
+          label={label}
+        />
       </div>
     )
   }
diff --git a/src/renderer/components/unsupported-media-modal.js b/src/renderer/components/unsupported-media-modal.js
index 29fcb934..2562f510 100644
--- a/src/renderer/components/unsupported-media-modal.js
+++ b/src/renderer/components/unsupported-media-modal.js
@@ -28,7 +28,8 @@ module.exports = class UnsupportedMediaModal extends React.Component {
           cancelText='CANCEL'
           onCancel={dispatcher('backToList')}
           okText={actionText}
-          onOK={onAction} />
+          onOK={onAction}
+        />
         <p className='error-text'>{errorMessage}</p>
       </div>
     )
diff --git a/src/renderer/components/update-available-modal.js b/src/renderer/components/update-available-modal.js
index 5faa47fe..d62e9b05 100644
--- a/src/renderer/components/update-available-modal.js
+++ b/src/renderer/components/update-available-modal.js
@@ -18,7 +18,8 @@ module.exports = class UpdateAvailableModal extends React.Component {
           cancelText='SKIP THIS RELEASE'
           onCancel={handleSkip}
           okText='SHOW DOWNLOAD PAGE'
-          onOK={handleShow} />
+          onOK={handleShow}
+        />
       </div>
     )
 
diff --git a/src/renderer/pages/app.js b/src/renderer/pages/app.js
index da716bb6..77de5a9a 100644
--- a/src/renderer/pages/app.js
+++ b/src/renderer/pages/app.js
@@ -90,7 +90,8 @@ class App extends React.Component {
     return (
       <div
         key='errors'
-        className={'error-popover ' + (hasErrors ? 'visible' : 'hidden')}>
+        className={'error-popover ' + (hasErrors ? 'visible' : 'hidden')}
+      >
         <div key='title' className='title'>Error</div>
         {errorElems}
       </div>
diff --git a/src/renderer/pages/create-torrent-page.js b/src/renderer/pages/create-torrent-page.js
index c5c4ad70..7718a546 100644
--- a/src/renderer/pages/create-torrent-page.js
+++ b/src/renderer/pages/create-torrent-page.js
@@ -94,7 +94,8 @@ class CreateTorrentPage extends React.Component {
             marginBottom: 10
           }}
           hideLabel='Hide advanced settings...'
-          showLabel='Show advanced settings...'>
+          showLabel='Show advanced settings...'
+        >
           {this.renderAdvanced()}
         </ShowMore>
         <div className='float-right'>
@@ -104,12 +105,14 @@ class CreateTorrentPage extends React.Component {
             style={{
               marginRight: 10
             }}
-            onClick={dispatcher('cancel')} />
+            onClick={dispatcher('cancel')}
+          />
           <RaisedButton
             className='control create-torrent-button'
             label='Create Torrent'
             primary
-            onClick={this.handleSubmit} />
+            onClick={this.handleSubmit}
+          />
         </div>
       </div>
     )
@@ -143,7 +146,8 @@ class CreateTorrentPage extends React.Component {
             className='torrent-is-private control'
             style={{ display: '' }}
             checked={this.state.isPrivate}
-            onCheck={this.setIsPrivate} />
+            onCheck={this.setIsPrivate}
+          />
         </div>
         <div key='trackers' className='torrent-attribute'>
           <label>Trackers:</label>
@@ -155,7 +159,8 @@ class CreateTorrentPage extends React.Component {
             rows={2}
             rowsMax={10}
             value={this.state.trackers}
-            onChange={this.setTrackers} />
+            onChange={this.setTrackers}
+          />
         </div>
         <div key='comment' className='torrent-attribute'>
           <label>Comment:</label>
@@ -168,7 +173,8 @@ class CreateTorrentPage extends React.Component {
             rows={2}
             rowsMax={10}
             value={this.state.comment}
-            onChange={this.setComment} />
+            onChange={this.setComment}
+          />
         </div>
         <div key='files' className='torrent-attribute'>
           <label>Files:</label>
diff --git a/src/renderer/pages/player-page.js b/src/renderer/pages/player-page.js
index ca145923..db8f4347 100644
--- a/src/renderer/pages/player-page.js
+++ b/src/renderer/pages/player-page.js
@@ -22,7 +22,8 @@ module.exports = class Player extends React.Component {
       <div
         className='player'
         onWheel={handleVolumeWheel}
-        onMouseMove={dispatcher('mediaMouseMoved')}>
+        onMouseMove={dispatcher('mediaMouseMoved')}
+      >
         {showVideo ? renderMedia(state) : renderCastScreen(state)}
         {showControls ? renderPlayerControls(state) : null}
       </div>
@@ -112,7 +113,8 @@ function renderMedia (state) {
           default={isSelected ? 'default' : ''}
           label={track.label}
           type='subtitles'
-          src={track.buffer} />
+          src={track.buffer}
+        />
       )
     }
   }
@@ -140,7 +142,8 @@ function renderMedia (state) {
     <div
       key='letterbox'
       className='letterbox'
-      onMouseMove={dispatcher('mediaMouseMoved')}>
+      onMouseMove={dispatcher('mediaMouseMoved')}
+    >
       {mediaTag}
       {renderOverlay(state)}
     </div>
@@ -490,41 +493,47 @@ function renderPlayerControls (state) {
       <div
         key='cursor'
         className='playback-cursor'
-        style={playbackCursorStyle} />
+        style={playbackCursorStyle}
+      />
       <div
         key='scrub-bar'
         className='scrub-bar'
         draggable='true'
         onDragStart={handleDragStart}
         onClick={handleScrub}
-        onDrag={handleScrub} />
+        onDrag={handleScrub}
+      />
     </div>,
 
     <i
       key='skip-previous'
       className={'icon skip-previous float-left ' + prevClass}
-      onClick={dispatcher('previousTrack')}>
+      onClick={dispatcher('previousTrack')}
+    >
       skip_previous
     </i>,
 
     <i
       key='play'
       className='icon play-pause float-left'
-      onClick={dispatcher('playPause')}>
+      onClick={dispatcher('playPause')}
+    >
       {state.playing.isPaused ? 'play_arrow' : 'pause'}
     </i>,
 
     <i
       key='skip-next'
       className={'icon skip-next float-left ' + nextClass}
-      onClick={dispatcher('nextTrack')}>
+      onClick={dispatcher('nextTrack')}
+    >
       skip_next
     </i>,
 
     <i
       key='fullscreen'
       className='icon fullscreen float-right'
-      onClick={dispatcher('toggleFullScreen')}>
+      onClick={dispatcher('toggleFullScreen')}
+    >
       {state.window.isFullScreen ? 'fullscreen_exit' : 'fullscreen'}
     </i>
   ]
@@ -535,7 +544,8 @@ function renderPlayerControls (state) {
       <i
         key='subtitles'
         className={'icon closed-caption float-right ' + captionsClass}
-        onClick={handleSubtitles}>
+        onClick={handleSubtitles}
+      >
         closed_caption
       </i>
     ))
@@ -579,7 +589,8 @@ function renderPlayerControls (state) {
       <i
         key={castType}
         className={'icon device float-right ' + buttonClass}
-        onClick={buttonHandler}>
+        onClick={buttonHandler}
+      >
         {buttonIcon}
       </i>
     ))
@@ -602,7 +613,8 @@ function renderPlayerControls (state) {
     <div key='volume' className='volume float-left'>
       <i
         className='icon volume-icon float-left'
-        onMouseDown={handleVolumeMute}>
+        onMouseDown={handleVolumeMute}
+      >
         {volumeIcon}
       </i>
       <input
@@ -610,7 +622,8 @@ function renderPlayerControls (state) {
         type='range' min='0' max='1' step='0.05'
         value={volume}
         onChange={handleVolumeScrub}
-        style={volumeStyle} />
+        style={volumeStyle}
+      />
     </div>
   ))
 
@@ -636,7 +649,8 @@ function renderPlayerControls (state) {
     <div
       key='controls' className='controls'
       onMouseEnter={dispatcher('mediaControlsMouseEnter')}
-      onMouseLeave={dispatcher('mediaControlsMouseLeave')}>
+      onMouseLeave={dispatcher('mediaControlsMouseLeave')}
+    >
       {elements}
       {renderCastOptions(state)}
       {renderSubtitleOptions(state)}
diff --git a/src/renderer/pages/preferences-page.js b/src/renderer/pages/preferences-page.js
index 5e76e8f5..fe556061 100644
--- a/src/renderer/pages/preferences-page.js
+++ b/src/renderer/pages/preferences-page.js
@@ -41,7 +41,8 @@ class PreferencesPage extends React.Component {
           }}
           onChange={this.handleDownloadPathChange}
           title='Download location'
-          value={this.props.state.saved.prefs.downloadPath} />
+          value={this.props.state.saved.prefs.downloadPath}
+        />
       </Preference>
     )
   }
@@ -57,7 +58,8 @@ class PreferencesPage extends React.Component {
           className='control'
           checked={!this.props.state.saved.prefs.openExternalPlayer}
           label={'Play torrent media files using WebTorrent'}
-          onCheck={this.handleOpenExternalPlayerChange} />
+          onCheck={this.handleOpenExternalPlayerChange}
+        />
       </Preference>
     )
   }
@@ -103,7 +105,8 @@ class PreferencesPage extends React.Component {
           displayValue={playerName}
           onChange={this.handleExternalPlayerPathChange}
           title='External player'
-          value={playerPath ? path.dirname(playerPath) : null} />
+          value={playerPath ? path.dirname(playerPath) : null}
+        />
       </Preference>
     )
   }
@@ -156,7 +159,8 @@ class PreferencesPage extends React.Component {
           displayValue={torrentsFolderPath || ''}
           onChange={this.handletorrentsFolderPathChange}
           title='Folder to watch'
-          value={torrentsFolderPath ? path.dirname(torrentsFolderPath) : null} />
+          value={torrentsFolderPath ? path.dirname(torrentsFolderPath) : null}
+        />
       </Preference>
     )
   }
@@ -180,7 +184,8 @@ class PreferencesPage extends React.Component {
         <RaisedButton
           className='control'
           onClick={this.handleSetDefaultApp}
-          label='Make WebTorrent the default' />
+          label='Make WebTorrent the default'
+        />
       </Preference>
     )
   }
@@ -213,7 +218,8 @@ class PreferencesPage extends React.Component {
           className='control'
           checked={this.props.state.saved.prefs.soundNotifications}
           label={'Enable sounds'}
-          onCheck={this.handleSoundNotificationsChange} />
+          onCheck={this.handleSoundNotificationsChange}
+        />
       </Preference>
     )
   }
diff --git a/src/renderer/pages/torrent-list-page.js b/src/renderer/pages/torrent-list-page.js
index c1ac1669..f60dfa15 100644
--- a/src/renderer/pages/torrent-list-page.js
+++ b/src/renderer/pages/torrent-list-page.js
@@ -67,7 +67,8 @@ module.exports = class TorrentList extends React.Component {
         style={style}
         className={classes.join(' ')}
         onContextMenu={infoHash && dispatcher('openTorrentContextMenu', infoHash)}
-        onClick={infoHash && dispatcher('toggleSelectTorrent', infoHash)}>
+        onClick={infoHash && dispatcher('toggleSelectTorrent', infoHash)}
+      >
         {this.renderTorrentMetadata(torrentSummary)}
         {infoHash ? this.renderTorrentButtons(torrentSummary) : null}
         {isSelected ? this.renderTorrentDetails(torrentSummary) : null}
@@ -130,7 +131,8 @@ module.exports = class TorrentList extends React.Component {
           }}
           checked={isActive}
           onClick={stopPropagation}
-          onCheck={dispatcher('toggleTorrent', infoHash)} />
+          onCheck={dispatcher('toggleTorrent', infoHash)}
+        />
       )
     }
 
@@ -233,7 +235,8 @@ module.exports = class TorrentList extends React.Component {
           key='play-button'
           title='Start streaming'
           className={'icon play'}
-          onClick={dispatcher('playFile', infoHash)}>
+          onClick={dispatcher('playFile', infoHash)}
+        >
           play_circle_outline
         </i>
       )
@@ -246,7 +249,8 @@ module.exports = class TorrentList extends React.Component {
           key='delete-button'
           className='icon delete'
           title='Remove torrent'
-          onClick={dispatcher('confirmDeleteTorrent', infoHash, false)}>
+          onClick={dispatcher('confirmDeleteTorrent', infoHash, false)}
+        >
           close
         </i>
       </div>
@@ -357,7 +361,8 @@ module.exports = class TorrentList extends React.Component {
         </td>
         <td
           className='col-select'
-          onClick={dispatcher('toggleTorrentFile', infoHash, index)}>
+          onClick={dispatcher('toggleTorrentFile', infoHash, index)}
+        >
           <i className='icon deselect-file'>{isSelected ? 'close' : 'add'}</i>
         </td>
       </tr>