diff --git a/CHANGELOG.md b/CHANGELOG.md
index af16a84d0..d4c711f27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,11 +9,21 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
    * Add keyboard shortcut to quit the app on Windows ([#1202](https://github.com/lbryio/lbry-app/pull/1202))
    * Build for both architectures (x86 and x64) for Windows ([#1262](https://github.com/lbryio/lbry-app/pull/1262))
    * Add referral FAQ to Invites screen([#1314](https://github.com/lbryio/lbry-app/pull/1314))
+   * Show exact wallet balance on mouse hover over ([#1305](https://github.com/lbryio/lbry-app/pull/1305))
+   * New dark mode ([#1269](https://github.com/lbryio/lbry-app/pull/1269))
+   * Pre-fill publish URL after clicking "Put something here" link ([#1303](https://github.com/lbryio/lbry-app/pull/1303))
+
+### Changed
+* Add flair to snackbar ([#1313](https://github.com/lbryio/lbry-app/pull/1313))
 
 ### Fixed
    * Black screen on macOS after maximizing LBRY and then closing ([#1235](https://github.com/lbryio/lbry-app/pull/1235))
    * Fix content-type not shown correctly in file description ([#863](https://github.com/lbryio/lbry-app/pull/863))
 
+### Fixed
+   * Black screen on macOS after maximizing LBRY and then closing ([#1235](https://github.com/lbryio/lbry-app/pull/1235))
+   * Fix dark theme ([#1034](https://github.com/lbryio/lbry-app/issues/1034))
+   * Fix download percentage indicator overlay ([#1271](https://github.com/lbryio/lbry-app/issues/1271))
 
 
 ## [0.21.2] - 2018-03-22
diff --git a/package.json b/package.json
index f18ddc8dc..976987947 100644
--- a/package.json
+++ b/package.json
@@ -48,6 +48,7 @@
     "find-process": "^1.1.0",
     "formik": "^0.10.4",
     "keytar": "^4.2.1",
+    "lbry-redux": "lbryio/lbry-redux",
     "localforage": "^1.7.1",
     "mixpanel-browser": "^2.17.1",
     "moment": "^2.22.0",
@@ -60,7 +61,7 @@
     "react-modal": "^3.1.7",
     "react-paginate": "^5.2.1",
     "react-redux": "^5.0.3",
-    "react-simplemde-editor": "^3.6.11",
+    "react-simplemde-editor": "3.6.11",
     "react-transition-group": "1.x",
     "redux": "^3.6.0",
     "redux-logger": "^3.0.1",
diff --git a/src/renderer/component/address/view.jsx b/src/renderer/component/address/view.jsx
index eff0f6697..2beadfda3 100644
--- a/src/renderer/component/address/view.jsx
+++ b/src/renderer/component/address/view.jsx
@@ -23,7 +23,7 @@ export default class Address extends React.PureComponent<Props> {
     const { address, doShowSnackBar } = this.props;
 
     return (
-      <FormRow verticallyCentered padded>
+      <FormRow verticallyCentered padded stretch>
         <input
           className="input-copyable form-field__input"
           readOnly
diff --git a/src/renderer/component/app/index.js b/src/renderer/component/app/index.js
index 9589e9280..d78487976 100644
--- a/src/renderer/component/app/index.js
+++ b/src/renderer/component/app/index.js
@@ -1,12 +1,8 @@
 import { connect } from 'react-redux';
-import {
-  selectPageTitle,
-  selectHistoryIndex,
-  selectActiveHistoryEntry,
-} from 'redux/selectors/navigation';
+import { selectPageTitle, selectHistoryIndex, selectActiveHistoryEntry } from 'lbry-redux';
+import { doRecordScroll } from 'redux/actions/navigation';
 import { selectUser } from 'redux/selectors/user';
 import { doAlertError } from 'redux/actions/app';
-import { doRecordScroll } from 'redux/actions/navigation';
 import App from './view';
 
 const select = state => ({
diff --git a/src/renderer/component/button/index.js b/src/renderer/component/button/index.js
index edebcbce1..478015d09 100644
--- a/src/renderer/component/button/index.js
+++ b/src/renderer/component/button/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { doNavigate } from 'redux/actions/navigation';
 import Button from './view';
diff --git a/src/renderer/component/cardMedia/view.jsx b/src/renderer/component/cardMedia/view.jsx
index a0d4b6d4e..28f526ee3 100644
--- a/src/renderer/component/cardMedia/view.jsx
+++ b/src/renderer/component/cardMedia/view.jsx
@@ -22,9 +22,7 @@ const autoThumbColors = [
 ];
 
 class CardMedia extends React.PureComponent<Props> {
-  getAutoThumbClass = () => {
-    return autoThumbColors[Math.floor(Math.random() * autoThumbColors.length)];
-  };
+  getAutoThumbClass = () => autoThumbColors[Math.floor(Math.random() * autoThumbColors.length)];
 
   render() {
     const { thumbnail, nsfw } = this.props;
diff --git a/src/renderer/component/cardVerify/view.jsx b/src/renderer/component/cardVerify/view.jsx
index 2df72f076..7d8382c4c 100644
--- a/src/renderer/component/cardVerify/view.jsx
+++ b/src/renderer/component/cardVerify/view.jsx
@@ -158,7 +158,7 @@ class CardVerify extends React.Component {
   render() {
     return (
       <Button
-        button="alt"
+        button="primary"
         label={this.props.label}
         icon={icons.LOCK}
         disabled={this.props.disabled || this.state.open || this.hasPendingClick}
diff --git a/src/renderer/component/channelTile/index.js b/src/renderer/component/channelTile/index.js
index 51a4835f6..c272fc2bf 100644
--- a/src/renderer/component/channelTile/index.js
+++ b/src/renderer/component/channelTile/index.js
@@ -1,10 +1,7 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import { doResolveUri, makeSelectClaimForUri, makeSelectIsUriResolving } from 'lbry-redux';
 import { doNavigate } from 'redux/actions/navigation';
-import { doResolveUri } from 'redux/actions/content';
 import { makeSelectTotalItemsForChannel } from 'redux/selectors/content';
-import { makeSelectIsUriResolving } from 'redux/selectors/content';
 import ChannelTile from './view';
 
 const select = (state, props) => ({
diff --git a/src/renderer/component/common/busy-indicator.jsx b/src/renderer/component/common/busy-indicator.jsx
index ee95a00ca..759e91b5c 100644
--- a/src/renderer/component/common/busy-indicator.jsx
+++ b/src/renderer/component/common/busy-indicator.jsx
@@ -5,12 +5,10 @@ type Props = {
   message: ?string,
 };
 
-const BusyIndicator = (props: Props) => {
-  return (
-    <span className="busy-indicator">
-      {props.message} <span className="busy-indicator__loader" />
-    </span>
-  );
-};
+const BusyIndicator = (props: Props) => (
+  <span className="busy-indicator">
+    {props.message} <span className="busy-indicator__loader" />
+  </span>
+);
 
 export default BusyIndicator;
diff --git a/src/renderer/component/common/category-list.jsx b/src/renderer/component/common/category-list.jsx
index f20b355bc..4b1589cee 100644
--- a/src/renderer/component/common/category-list.jsx
+++ b/src/renderer/component/common/category-list.jsx
@@ -1,6 +1,6 @@
 // @flow
 import React from 'react';
-import { normalizeURI } from 'lbryURI';
+import { normalizeURI } from 'lbry-redux';
 import ToolTip from 'component/common/tooltip';
 import FileCard from 'component/fileCard';
 import Button from 'component/button';
diff --git a/src/renderer/component/common/form-components/form-field.jsx b/src/renderer/component/common/form-components/form-field.jsx
index 212982299..ffbc7eabc 100644
--- a/src/renderer/component/common/form-components/form-field.jsx
+++ b/src/renderer/component/common/form-components/form-field.jsx
@@ -36,6 +36,8 @@ export class FormField extends React.PureComponent<Props> {
       ...inputProps
     } = this.props;
 
+    const errorMessage = typeof error === 'object' ? error.message : error;
+
     let input;
     if (type) {
       if (type === 'select') {
@@ -54,6 +56,8 @@ export class FormField extends React.PureComponent<Props> {
             />
           </div>
         );
+      } else if (type === 'textarea') {
+        input = <textarea type={type} id={name} {...inputProps} />;
       } else {
         input = <input type={type} id={name} {...inputProps} />;
       }
@@ -65,13 +69,13 @@ export class FormField extends React.PureComponent<Props> {
           'form-field--stretch': stretch || type === 'markdown',
         })}
       >
-        {(label || error) && (
+        {(label || errorMessage) && (
           <label
-            className={classnames('form-field__label', { 'form-field__error': error })}
+            className={classnames('form-field__label', { 'form-field__error': errorMessage })}
             htmlFor={name}
           >
-            {!error && label}
-            {error}
+            {!errorMessage && label}
+            {errorMessage}
           </label>
         )}
         <div
diff --git a/src/renderer/component/common/form-components/form-row.jsx b/src/renderer/component/common/form-components/form-row.jsx
index c3e9c06e3..1216ba816 100644
--- a/src/renderer/component/common/form-components/form-row.jsx
+++ b/src/renderer/component/common/form-components/form-row.jsx
@@ -8,6 +8,7 @@ type Props = {
   children: React.Node,
   padded?: boolean,
   verticallyCentered?: boolean,
+  stretch?: boolean,
 };
 
 export class FormRow extends React.PureComponent<Props> {
@@ -16,13 +17,14 @@ export class FormRow extends React.PureComponent<Props> {
   };
 
   render() {
-    const { centered, children, padded, verticallyCentered } = this.props;
+    const { centered, children, padded, verticallyCentered, stretch } = this.props;
     return (
       <div
         className={classnames('form-row', {
           'form-row--centered': centered,
           'form-row--padded': padded,
           'form-row--vertically-centered': verticallyCentered,
+          'form-row--stretch': stretch,
         })}
       >
         {children}
diff --git a/src/renderer/component/common/icon.jsx b/src/renderer/component/common/icon.jsx
index 1f82f3351..602f5fbd2 100644
--- a/src/renderer/component/common/icon.jsx
+++ b/src/renderer/component/common/icon.jsx
@@ -8,7 +8,6 @@ const RED_COLOR = '#e2495e';
 
 type Props = {
   icon: string,
-  size?: number,
 };
 
 class IconComponent extends React.PureComponent<Props> {
diff --git a/src/renderer/component/common/qr-code.jsx b/src/renderer/component/common/qr-code.jsx
index 7f03301b0..fb74c68d7 100644
--- a/src/renderer/component/common/qr-code.jsx
+++ b/src/renderer/component/common/qr-code.jsx
@@ -1,18 +1,30 @@
 // @flow
 import React from 'react';
 import QRCodeElement from 'qrcode.react';
+import classnames from 'classnames';
 
 type Props = {
   value: string,
+  paddingRight?: boolean,
 };
 
-const QRCode = (props: Props) => {
-  const { value } = props;
-  return (
-    <div className="qr-code">
-      <QRCodeElement value={value} />
-    </div>
-  );
-};
+class QRCode extends React.Component<Props> {
+  static defaultProps = {
+    paddingRight: false,
+  };
+
+  render() {
+    const { value, paddingRight } = this.props;
+    return (
+      <div
+        className={classnames('qr-code', {
+          'qr-code--right-padding': paddingRight,
+        })}
+      >
+        <QRCodeElement value={value} />
+      </div>
+    );
+  }
+}
 
 export default QRCode;
diff --git a/src/renderer/component/common/transaction-link.jsx b/src/renderer/component/common/transaction-link.jsx
index 2d48feb96..f1e7f5bfe 100644
--- a/src/renderer/component/common/transaction-link.jsx
+++ b/src/renderer/component/common/transaction-link.jsx
@@ -9,7 +9,7 @@ type Props = {
 const TransactionLink = (props: Props) => {
   const { id } = props;
 
-  const href = `https://explorer.lbry.io/#!/transaction/${id}`;
+  const href = `https://explorer.lbry.io/tx/${id}`;
   const label = id.substr(0, 7);
 
   return <Button button="link" href={href} label={label} />;
diff --git a/src/renderer/component/common/truncated-text.jsx b/src/renderer/component/common/truncated-text.jsx
index d5f4f5961..8736ae530 100644
--- a/src/renderer/component/common/truncated-text.jsx
+++ b/src/renderer/component/common/truncated-text.jsx
@@ -6,12 +6,10 @@ type Props = {
   children: React.Node,
 };
 
-const TruncatedText = (props: Props) => {
-  return (
-    <span className="truncated-text" style={{ WebkitLineClamp: props.lines }}>
-      {props.children}
-    </span>
-  );
-};
+const TruncatedText = (props: Props) => (
+  <span className="truncated-text" style={{ WebkitLineClamp: props.lines }}>
+    {props.children}
+  </span>
+);
 
 export default TruncatedText;
diff --git a/src/renderer/component/dateTime/index.js b/src/renderer/component/dateTime/index.js
index 06009a4ca..adae8f658 100644
--- a/src/renderer/component/dateTime/index.js
+++ b/src/renderer/component/dateTime/index.js
@@ -1,7 +1,5 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { makeSelectBlockDate } from 'redux/selectors/wallet';
-import { doFetchBlock } from 'redux/actions/wallet';
+import { doFetchBlock, makeSelectBlockDate } from 'lbry-redux';
 import DateTime from './view';
 
 const select = (state, props) => ({
diff --git a/src/renderer/component/fileActions/index.js b/src/renderer/component/fileActions/index.js
index b848342c0..44eed16c5 100644
--- a/src/renderer/component/fileActions/index.js
+++ b/src/renderer/component/fileActions/index.js
@@ -1,9 +1,10 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { makeSelectFileInfoForUri } from 'redux/selectors/file_info';
-import { makeSelectCostInfoForUri } from 'redux/selectors/cost_info';
 import { doOpenModal } from 'redux/actions/app';
-import { makeSelectClaimIsMine } from 'redux/selectors/claims';
+import {
+  makeSelectCostInfoForUri,
+  makeSelectFileInfoForUri,
+  makeSelectClaimIsMine,
+} from 'lbry-redux';
 import FileActions from './view';
 
 const select = (state, props) => ({
diff --git a/src/renderer/component/fileCard/index.js b/src/renderer/component/fileCard/index.js
index c7334c1b8..dcb4774f9 100644
--- a/src/renderer/component/fileCard/index.js
+++ b/src/renderer/component/fileCard/index.js
@@ -1,10 +1,14 @@
 import { connect } from 'react-redux';
+import {
+  doResolveUri,
+  makeSelectClaimForUri,
+  makeSelectMetadataForUri,
+  makeSelectFileInfoForUri,
+  makeSelectIsUriResolving,
+} from 'lbry-redux';
 import { doNavigate } from 'redux/actions/navigation';
-import { doResolveUri } from 'redux/actions/content';
+import { selectRewardContentClaimIds } from 'redux/selectors/content';
 import { selectShowNsfw } from 'redux/selectors/settings';
-import { makeSelectClaimForUri, makeSelectMetadataForUri } from 'redux/selectors/claims';
-import { makeSelectFileInfoForUri } from 'redux/selectors/file_info';
-import { makeSelectIsUriResolving, selectRewardContentClaimIds } from 'redux/selectors/content';
 import { selectPendingPublish } from 'redux/selectors/publish';
 import FileCard from './view';
 
diff --git a/src/renderer/component/fileCard/view.jsx b/src/renderer/component/fileCard/view.jsx
index faf1d2eef..88bb99946 100644
--- a/src/renderer/component/fileCard/view.jsx
+++ b/src/renderer/component/fileCard/view.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react';
-import { normalizeURI } from 'lbryURI';
+import { normalizeURI } from 'lbry-redux';
 import Button from 'component/button';
 import CardMedia from 'component/cardMedia';
 import TruncatedText from 'component/common/truncated-text';
diff --git a/src/renderer/component/fileDetails/index.js b/src/renderer/component/fileDetails/index.js
index 9b877dec9..18541f6da 100644
--- a/src/renderer/component/fileDetails/index.js
+++ b/src/renderer/component/fileDetails/index.js
@@ -1,13 +1,12 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import {
   makeSelectClaimForUri,
   makeSelectContentTypeForUri,
   makeSelectMetadataForUri,
-} from 'redux/selectors/claims';
+  makeSelectFileInfoForUri,
+} from 'lbry-redux';
+import { doOpenFileInFolder } from 'redux/actions/file';
 import FileDetails from './view';
-import { doOpenFileInFolder } from 'redux/actions/file_info';
-import { makeSelectFileInfoForUri } from 'redux/selectors/file_info';
 
 const select = (state, props) => ({
   claim: makeSelectClaimForUri(props.uri)(state),
diff --git a/src/renderer/component/fileDetails/view.jsx b/src/renderer/component/fileDetails/view.jsx
index 753000be1..9425ff19f 100644
--- a/src/renderer/component/fileDetails/view.jsx
+++ b/src/renderer/component/fileDetails/view.jsx
@@ -30,8 +30,8 @@ const FileDetails = (props: Props) => {
   }
 
   const { description, language, license } = metadata;
+  
   const mediaType = contentType || 'unknown';
-
   const downloadPath = fileInfo ? path.normalize(fileInfo.download_path) : null;
 
   return (
diff --git a/src/renderer/component/fileDownloadLink/index.js b/src/renderer/component/fileDownloadLink/index.js
index e13b4b3d4..d36f4c896 100644
--- a/src/renderer/component/fileDownloadLink/index.js
+++ b/src/renderer/component/fileDownloadLink/index.js
@@ -1,13 +1,12 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import {
   makeSelectFileInfoForUri,
   makeSelectDownloadingForUri,
   makeSelectLoadingForUri,
-} from 'redux/selectors/file_info';
-import { makeSelectCostInfoForUri } from 'redux/selectors/cost_info';
+  makeSelectCostInfoForUri,
+} from 'lbry-redux';
 import { doFetchAvailability } from 'redux/actions/availability';
-import { doOpenFileInShell } from 'redux/actions/file_info';
+import { doOpenFileInShell } from 'redux/actions/file';
 import { doPurchaseUri, doStartDownload } from 'redux/actions/content';
 import { doPause } from 'redux/actions/media';
 import FileDownloadLink from './view';
diff --git a/src/renderer/component/fileList/index.js b/src/renderer/component/fileList/index.js
index bfaff712a..0bcb519e5 100644
--- a/src/renderer/component/fileList/index.js
+++ b/src/renderer/component/fileList/index.js
@@ -1,7 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
 import FileList from './view';
-import { selectClaimsById } from 'redux/selectors/claims';
+import { selectClaimsById } from 'lbry-redux';
 
 const select = state => ({
   claimsById: selectClaimsById(state),
diff --git a/src/renderer/component/fileList/view.jsx b/src/renderer/component/fileList/view.jsx
index 3f31e8b0f..ffe8ecbff 100644
--- a/src/renderer/component/fileList/view.jsx
+++ b/src/renderer/component/fileList/view.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react';
-import { buildURI } from 'lbryURI';
+import { buildURI } from 'lbry-redux';
 import { FormField } from 'component/common/form';
 import FileCard from 'component/fileCard';
 
diff --git a/src/renderer/component/fileListSearch/index.js b/src/renderer/component/fileListSearch/index.js
index 328295768..77ab70d07 100644
--- a/src/renderer/component/fileListSearch/index.js
+++ b/src/renderer/component/fileListSearch/index.js
@@ -1,7 +1,10 @@
 import { connect } from 'react-redux';
-import { doSearch } from 'redux/actions/search';
-import { makeSelectSearchUris, selectIsSearching } from 'redux/selectors/search';
-import { selectSearchDownloadUris } from 'redux/selectors/file_info';
+import {
+  doSearch,
+  makeSelectSearchUris,
+  selectIsSearching,
+  selectSearchDownloadUris,
+} from 'lbry-redux';
 import FileListSearch from './view';
 
 const select = (state, props) => ({
diff --git a/src/renderer/component/fileListSearch/view.jsx b/src/renderer/component/fileListSearch/view.jsx
index 25694d1c7..48324f763 100644
--- a/src/renderer/component/fileListSearch/view.jsx
+++ b/src/renderer/component/fileListSearch/view.jsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import FileTile from 'component/fileTile';
 import ChannelTile from 'component/channelTile';
-import { parseURI } from 'lbryURI';
+import { parseURI } from 'lbry-redux';
 import debounce from 'util/debounce';
 
 const SEARCH_DEBOUNCE_TIME = 800;
diff --git a/src/renderer/component/filePrice/index.js b/src/renderer/component/filePrice/index.js
index 93eaee79d..8351dc6f1 100644
--- a/src/renderer/component/filePrice/index.js
+++ b/src/renderer/component/filePrice/index.js
@@ -1,11 +1,10 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doFetchCostInfoForUri } from 'redux/actions/cost_info';
 import {
+  doFetchCostInfoForUri,
   makeSelectCostInfoForUri,
   makeSelectFetchingCostInfoForUri,
-} from 'redux/selectors/cost_info';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+  makeSelectClaimForUri,
+} from 'lbry-redux';
 import FilePrice from './view';
 
 const select = (state, props) => ({
diff --git a/src/renderer/component/fileTile/index.js b/src/renderer/component/fileTile/index.js
index a85de00e9..3403eef62 100644
--- a/src/renderer/component/fileTile/index.js
+++ b/src/renderer/component/fileTile/index.js
@@ -1,11 +1,14 @@
-import React from 'react';
 import { connect } from 'react-redux';
+import {
+  doResolveUri,
+  makeSelectClaimForUri,
+  makeSelectMetadataForUri,
+  makeSelectFileInfoForUri,
+  makeSelectIsUriResolving,
+} from 'lbry-redux';
 import { doNavigate } from 'redux/actions/navigation';
-import { doResolveUri } from 'redux/actions/content';
-import { makeSelectClaimForUri, makeSelectMetadataForUri } from 'redux/selectors/claims';
-import { makeSelectFileInfoForUri } from 'redux/selectors/file_info';
-import { selectShowNsfw } from 'redux/selectors/settings';
-import { makeSelectIsUriResolving, selectRewardContentClaimIds } from 'redux/selectors/content';
+import { doClearPublish, doUpdatePublishForm } from 'redux/actions/publish';
+import { selectRewardContentClaimIds } from 'redux/selectors/content';
 import FileTile from './view';
 
 const select = (state, props) => ({
@@ -17,8 +20,10 @@ const select = (state, props) => ({
 });
 
 const perform = dispatch => ({
+  clearPublish: () => dispatch(doClearPublish()),
   navigate: (path, params) => dispatch(doNavigate(path, params)),
   resolveUri: uri => dispatch(doResolveUri(uri)),
+  updatePublishForm: value => dispatch(doUpdatePublishForm(value)),
 });
 
 export default connect(select, perform)(FileTile);
diff --git a/src/renderer/component/fileTile/view.jsx b/src/renderer/component/fileTile/view.jsx
index 7761b9f4e..e68cc886b 100644
--- a/src/renderer/component/fileTile/view.jsx
+++ b/src/renderer/component/fileTile/view.jsx
@@ -1,10 +1,9 @@
 // @flow
 import * as React from 'react';
 import * as icons from 'constants/icons';
-import { normalizeURI, isURIClaimable, parseURI } from 'lbryURI';
+import { normalizeURI, isURIClaimable, parseURI } from 'lbry-redux';
 import CardMedia from 'component/cardMedia';
 import TruncatedText from 'component/common/truncated-text';
-import FilePrice from 'component/filePrice';
 import Icon from 'component/common/icon';
 import Button from 'component/button';
 import classnames from 'classnames';
@@ -25,6 +24,8 @@ type Props = {
   metadata: {},
   resolveUri: string => void,
   navigate: (string, ?{}) => void,
+  clearPublish: () => void,
+  updatePublishForm: () => void,
 };
 
 class FileTile extends React.PureComponent<Props> {
@@ -55,6 +56,8 @@ class FileTile extends React.PureComponent<Props> {
       fullWidth,
       showLocal,
       isDownloaded,
+      clearPublish,
+      updatePublishForm,
     } = this.props;
 
     const uri = normalizeURI(this.props.uri);
@@ -69,7 +72,7 @@ class FileTile extends React.PureComponent<Props> {
     let name;
     let channel;
     if (claim) {
-      name = claim.name;
+      ({ name } = claim);
       channel = claim.channel_name;
     }
 
@@ -79,6 +82,9 @@ class FileTile extends React.PureComponent<Props> {
           'file-tile--fullwidth': fullWidth,
         })}
         onClick={onClick}
+        onKeyUp={onClick}
+        role="button"
+        tabIndex="0"
       >
         <CardMedia title={title || name} thumbnail={thumbnail} />
         <div className="file-tile__info">
@@ -101,7 +107,11 @@ class FileTile extends React.PureComponent<Props> {
                     label={__('Put something here!')}
                     onClick={e => {
                       // avoid navigating to /show from clicking on the section
-                      e.preventDefault();
+                      e.stopPropagation();
+                      // strip prefix from the Uri and use that as navigation parameter
+                      const nameFromUri = uri.replace(/lbry:\/\//g, '').replace(/-/g, ' ');
+                      clearPublish(); // to remove any existing publish data
+                      updatePublishForm({ name: nameFromUri }); // to populate the name
                       navigate('/publish');
                     }}
                   />
diff --git a/src/renderer/component/header/index.js b/src/renderer/component/header/index.js
index 073d0d2eb..0b5c8066f 100644
--- a/src/renderer/component/header/index.js
+++ b/src/renderer/component/header/index.js
@@ -1,22 +1,21 @@
 import { connect } from 'react-redux';
+import { selectBalance } from 'lbry-redux';
+import { formatCredits } from 'util/formatCredits';
 import { doNavigate } from 'redux/actions/navigation';
 import { selectIsUpgradeAvailable, selectAutoUpdateDownloaded } from 'redux/selectors/app';
-import { formatCredits } from 'util/formatCredits';
-import { selectBalance } from 'redux/selectors/wallet';
-import Header from './view';
 import { doDownloadUpgradeRequested } from 'redux/actions/app';
+import Header from './view';
 
 const select = state => ({
-  isUpgradeAvailable: selectIsUpgradeAvailable(state),
   autoUpdateDownloaded: selectAutoUpdateDownloaded(state),
-  balance: formatCredits(selectBalance(state) || 0, 2),
+  balance: selectBalance(state),
+  isUpgradeAvailable: selectIsUpgradeAvailable(state),
+  roundedBalance: formatCredits(selectBalance(state) || 0, 2),
 });
 
 const perform = dispatch => ({
-  navigate: path => dispatch(doNavigate(path)),
-  back: () => dispatch(doHistoryBack()),
-  forward: () => dispatch(doHistoryForward()),
   downloadUpgradeRequested: () => dispatch(doDownloadUpgradeRequested()),
+  navigate: path => dispatch(doNavigate(path)),
 });
 
 export default connect(select, perform)(Header);
diff --git a/src/renderer/component/header/view.jsx b/src/renderer/component/header/view.jsx
index e081e2139..1cbdceb13 100644
--- a/src/renderer/component/header/view.jsx
+++ b/src/renderer/component/header/view.jsx
@@ -5,20 +5,22 @@ import WunderBar from 'component/wunderbar';
 import * as icons from 'constants/icons';
 
 type Props = {
+  autoUpdateDownloaded: boolean,
   balance: string,
-  navigate: any => void,
   downloadUpgradeRequested: any => void,
   isUpgradeAvailable: boolean,
-  autoUpdateDownloaded: boolean,
+  navigate: any => void,
+  roundedBalance: string,
 };
 
 const Header = (props: Props) => {
   const {
+    autoUpdateDownloaded,
     balance,
+    downloadUpgradeRequested,
     isUpgradeAvailable,
     navigate,
-    downloadUpgradeRequested,
-    autoUpdateDownloaded,
+    roundedBalance,
   } = props;
 
   const showUpgradeButton =
@@ -37,7 +39,10 @@ const Header = (props: Props) => {
               `${balance}`
             ) : (
               <React.Fragment>
-                <span className="btn__label--balance">You have</span> <span>{balance} LBC</span>
+                <span className="btn__label--balance" title={`${balance} LBC`}>
+                  You have
+                </span>{' '}
+                <span title={`${balance} LBC`}>{roundedBalance} LBC</span>
               </React.Fragment>
             )
           }
@@ -48,6 +53,7 @@ const Header = (props: Props) => {
         <Button
           uppercase
           button="primary"
+          className="btn--header-publish"
           onClick={() => navigate('/publish')}
           icon={icons.UPLOAD}
           label={isUpgradeAvailable ? '' : __('Publish')}
diff --git a/src/renderer/component/nsfwOverlay/index.js b/src/renderer/component/nsfwOverlay/index.js
index 1343bd7c7..515a0ecd6 100644
--- a/src/renderer/component/nsfwOverlay/index.js
+++ b/src/renderer/component/nsfwOverlay/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { doNavigate } from 'redux/actions/navigation';
 import NsfwOverlay from './view';
diff --git a/src/renderer/component/page/index.js b/src/renderer/component/page/index.js
index 0bf9f77fe..f9111f85e 100644
--- a/src/renderer/component/page/index.js
+++ b/src/renderer/component/page/index.js
@@ -1,15 +1,15 @@
 import { connect } from 'react-redux';
 import {
+  selectBalance,
   selectPageTitle,
   selectIsBackDisabled,
   selectIsForwardDisabled,
   selectNavLinks,
-} from 'redux/selectors/navigation';
+} from 'lbry-redux';
 import { doNavigate, doHistoryBack, doHistoryForward } from 'redux/actions/navigation';
 import { doDownloadUpgrade } from 'redux/actions/app';
 import { selectIsUpgradeAvailable } from 'redux/selectors/app';
 import { formatCredits } from 'util/formatCredits';
-import { selectBalance } from 'redux/selectors/wallet';
 import Page from './view';
 
 const select = state => ({
diff --git a/src/renderer/component/publishForm/index.js b/src/renderer/component/publishForm/index.js
index 3eb2a7bc4..dfb124897 100644
--- a/src/renderer/component/publishForm/index.js
+++ b/src/renderer/component/publishForm/index.js
@@ -1,5 +1,5 @@
-import React from 'react';
 import { connect } from 'react-redux';
+import { selectBalance } from 'lbry-redux';
 import PublishForm from './view';
 
 export default connect(null, null)(PublishForm);
diff --git a/src/renderer/component/publishForm/internal/bid-help-text.jsx b/src/renderer/component/publishForm/internal/bid-help-text.jsx
index 8c99118d2..9d42bfac5 100644
--- a/src/renderer/component/publishForm/internal/bid-help-text.jsx
+++ b/src/renderer/component/publishForm/internal/bid-help-text.jsx
@@ -7,7 +7,7 @@ type Props = {
   editingURI: ?string,
   isResolvingUri: boolean,
   winningBidForClaimUri: ?number,
-  claimIsMine: ?boolean,
+  myClaimForUri: ?{},
   onEditMyClaim: any => void,
 };
 
@@ -18,7 +18,7 @@ class BidHelpText extends React.PureComponent<Props> {
       editingURI,
       isResolvingUri,
       winningBidForClaimUri,
-      claimIsMine,
+      myClaimForUri,
       onEditMyClaim,
     } = this.props;
 
@@ -34,12 +34,12 @@ class BidHelpText extends React.PureComponent<Props> {
       return __('Checking the winning claim amount...');
     }
 
-    if (claimIsMine) {
+    if (myClaimForUri) {
       return (
         <React.Fragment>
           {__('You already have a claim at')}
           {` ${uri} `}
-          <Button button="link" label="Edit it" onClick={onEditMyClaim} />
+          <Button button="link" label="Edit it" onClick={() => onEditMyClaim(myClaimForUri, uri)} />
           <br />
           {__('Publishing will update your existing claim.')}
         </React.Fragment>
diff --git a/src/renderer/component/publishForm/view.jsx b/src/renderer/component/publishForm/view.jsx
index fa858096d..ff3850a2c 100644
--- a/src/renderer/component/publishForm/view.jsx
+++ b/src/renderer/component/publishForm/view.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react';
-import { isNameValid, buildURI, regexInvalidURI } from 'lbryURI';
+import { isNameValid, buildURI, regexInvalidURI } from 'lbry-redux';
 import { Form, FormField, FormRow, FormFieldPrice, Submit } from 'component/common/form';
 import Button from 'component/button';
 import ChannelSection from 'component/selectChannel';
@@ -55,7 +55,7 @@ type Props = {
   clearPublish: () => void,
   resolveUri: string => void,
   scrollToTop: () => void,
-  prepareEdit: ({}) => void,
+  prepareEdit: ({}, uri) => void,
 };
 
 class PublishForm extends React.PureComponent<Props> {
@@ -159,10 +159,10 @@ class PublishForm extends React.PureComponent<Props> {
     updatePublishForm({ bid, bidError });
   }
 
-  editExistingClaim() {
-    const { myClaimForUri, prepareEdit, scrollToTop } = this.props;
+  editExistingClaim(myClaimForUri: ?{}, uri: string) {
+    const { prepareEdit, scrollToTop } = this.props;
     if (myClaimForUri) {
-      prepareEdit(myClaimForUri);
+      prepareEdit(myClaimForUri, uri);
       scrollToTop();
     }
   }
@@ -300,7 +300,8 @@ class PublishForm extends React.PureComponent<Props> {
     const formDisabled = (!filePath && !editingURI) || publishing;
     const formValid = this.checkIsFormValid();
 
-    const isStillEditing = editingURI === uri;
+    const simpleUri = uri && uri.split('#')[0];
+    const isStillEditing = editingURI === simpleUri;
     let submitLabel;
     if (isStillEditing) {
       submitLabel = !publishing ? __('Edit') : __('Editing...');
@@ -446,11 +447,11 @@ class PublishForm extends React.PureComponent<Props> {
                   error={nameError}
                   helper={
                     <BidHelpText
-                      uri={uri}
+                      uri={simpleUri}
                       editingURI={editingURI}
                       isResolvingUri={isResolvingUri}
                       winningBidForClaimUri={winningBidForClaimUri}
-                      claimIsMine={!!myClaimForUri}
+                      myClaimForUri={myClaimForUri}
                       onEditMyClaim={this.editExistingClaim}
                     />
                   }
diff --git a/src/renderer/component/rewardLink/index.js b/src/renderer/component/rewardLink/index.js
index 2fc1654a4..9ecfe0dba 100644
--- a/src/renderer/component/rewardLink/index.js
+++ b/src/renderer/component/rewardLink/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import {
   makeSelectClaimRewardError,
diff --git a/src/renderer/component/rewardLink/view.jsx b/src/renderer/component/rewardLink/view.jsx
index edb43aefd..535b7c994 100644
--- a/src/renderer/component/rewardLink/view.jsx
+++ b/src/renderer/component/rewardLink/view.jsx
@@ -1,14 +1,28 @@
+// @flow
 import React from 'react';
-import Modal from 'modal/modal';
+import { Modal } from 'modal/modal';
 import Button from 'component/button';
 
-const RewardLink = props => {
-  const { reward, button, claimReward, clearError, errorMessage, label, isPending } = props;
+type Reward = {
+  reward_amount: number,
+};
+
+type Props = {
+  isPending: boolean,
+  label: ?string,
+  errorMessage: ?string,
+  reward: Reward,
+  clearError: Reward => void,
+  claimReward: Reward => void,
+};
+
+const RewardLink = (props: Props) => {
+  const { reward, claimReward, clearError, errorMessage, label, isPending } = props;
 
   return !reward ? null : (
     <div className="reward-link">
       <Button
-        button="primary"
+        button="link"
         disabled={isPending}
         label={isPending ? __('Claiming...') : label || `${__('Get')} ${reward.reward_amount} LBC`}
         onClick={() => {
@@ -16,6 +30,7 @@ const RewardLink = props => {
         }}
       />
       {errorMessage ? (
+        // TODO: This should be moved to redux
         <Modal
           isOpen
           contentLabel="Reward Claim Error"
@@ -32,4 +47,5 @@ const RewardLink = props => {
     </div>
   );
 };
+
 export default RewardLink;
diff --git a/src/renderer/component/router/index.js b/src/renderer/component/router/index.js
index df1adc161..0e2a262cb 100644
--- a/src/renderer/component/router/index.js
+++ b/src/renderer/component/router/index.js
@@ -1,7 +1,6 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import Router from './view.jsx';
-import { selectCurrentPage, selectCurrentParams } from 'redux/selectors/navigation.js';
+import { selectCurrentPage, selectCurrentParams } from 'lbry-redux';
+import Router from './view';
 
 const select = state => ({
   params: selectCurrentParams(state),
diff --git a/src/renderer/component/router/view.jsx b/src/renderer/component/router/view.jsx
index 4b1cf2acc..f67e252a3 100644
--- a/src/renderer/component/router/view.jsx
+++ b/src/renderer/component/router/view.jsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import SettingsPage from 'page/settings';
 import HelpPage from 'page/help';
-import ReportPage from 'page/report.js';
+import ReportPage from 'page/report';
 import WalletPage from 'page/wallet';
-import GetCreditsPage from '../../page/getCredits';
+import GetCreditsPage from 'page/getCredits';
 import SendReceivePage from 'page/sendCredits';
 import ShowPage from 'page/show';
 import PublishPage from 'page/publish';
diff --git a/src/renderer/component/selectChannel/index.js b/src/renderer/component/selectChannel/index.js
index 66d208875..45314beef 100644
--- a/src/renderer/component/selectChannel/index.js
+++ b/src/renderer/component/selectChannel/index.js
@@ -1,8 +1,7 @@
 import { connect } from 'react-redux';
 import SelectChannel from './view';
-import { selectMyChannelClaims, selectFetchingMyChannels } from 'redux/selectors/claims';
+import { selectBalance, selectMyChannelClaims, selectFetchingMyChannels } from 'lbry-redux';
 import { doFetchChannelListMine, doCreateChannel } from 'redux/actions/content';
-import { selectBalance } from 'redux/selectors/wallet';
 
 const select = state => ({
   channels: selectMyChannelClaims(state),
diff --git a/src/renderer/component/selectChannel/view.jsx b/src/renderer/component/selectChannel/view.jsx
index 88182c49c..2c1f9ed22 100644
--- a/src/renderer/component/selectChannel/view.jsx
+++ b/src/renderer/component/selectChannel/view.jsx
@@ -1,6 +1,6 @@
 // @flow
 import React from 'react';
-import { isNameValid } from 'lbryURI';
+import { isNameValid } from 'lbry-redux';
 import { FormRow, FormField } from 'component/common/form';
 import BusyIndicator from 'component/common/busy-indicator';
 import Button from 'component/button';
diff --git a/src/renderer/component/shapeShift/index.js b/src/renderer/component/shapeShift/index.js
index 0c0cb5409..16ac8d4a7 100644
--- a/src/renderer/component/shapeShift/index.js
+++ b/src/renderer/component/shapeShift/index.js
@@ -6,8 +6,7 @@ import {
   clearShapeShift,
   getActiveShift,
 } from 'redux/actions/shape_shift';
-import { doShowSnackBar } from 'redux/actions/app';
-import { selectReceiveAddress } from 'redux/selectors/wallet';
+import { doShowSnackBar, selectReceiveAddress } from 'lbry-redux';
 import { selectShapeShift } from 'redux/selectors/shape_shift';
 import ShapeShift from './view';
 
diff --git a/src/renderer/component/shapeShift/internal/active-shift.jsx b/src/renderer/component/shapeShift/internal/active-shift.jsx
index bb4524bb7..0c07b808b 100644
--- a/src/renderer/component/shapeShift/internal/active-shift.jsx
+++ b/src/renderer/component/shapeShift/internal/active-shift.jsx
@@ -16,7 +16,6 @@ type Props = {
   shiftOrderId: ?string,
   originCoinDepositMax: ?number,
   clearShapeShift: Dispatch,
-  doShowSnackBar: Dispatch,
   getActiveShift: Dispatch,
   shapeShiftRate: ?number,
   originCoinDepositMax: ?number,
@@ -25,8 +24,6 @@ type Props = {
 };
 
 class ActiveShapeShift extends React.PureComponent<Props> {
-  continousFetch: ?number;
-
   constructor() {
     super();
     this.continousFetch = undefined;
@@ -59,6 +56,8 @@ class ActiveShapeShift extends React.PureComponent<Props> {
     }
   }
 
+  continousFetch: ?number;
+
   render() {
     const {
       shiftCoinType,
@@ -68,7 +67,6 @@ class ActiveShapeShift extends React.PureComponent<Props> {
       shiftState,
       originCoinDepositMax,
       clearShapeShift,
-      doShowSnackBar,
       shapeShiftRate,
       originCoinDepositFee,
       originCoinDepositMin,
@@ -95,8 +93,8 @@ class ActiveShapeShift extends React.PureComponent<Props> {
 
             {shiftDepositAddress && (
               <FormRow verticallyCentered padded>
-                <Address address={shiftDepositAddress} showCopyButton />
-                <QRCode value={shiftDepositAddress} />
+                <QRCode value={shiftDepositAddress} paddingRight />
+                <Address address={shiftDepositAddress} showCopyButton padded />
               </FormRow>
             )}
           </div>
diff --git a/src/renderer/component/shapeShift/internal/form.jsx b/src/renderer/component/shapeShift/internal/form.jsx
index 9fa588b5a..f4d057527 100644
--- a/src/renderer/component/shapeShift/internal/form.jsx
+++ b/src/renderer/component/shapeShift/internal/form.jsx
@@ -19,7 +19,6 @@ type Props = {
   isSubmitting: boolean,
   shiftSupportedCoins: Array<string>,
   originCoin: string,
-  updating: boolean,
   getCoinStats: Dispatch,
   originCoinDepositFee: number,
   originCoinDepositMin: string,
@@ -38,7 +37,6 @@ export default (props: Props) => {
     isSubmitting,
     shiftSupportedCoins,
     originCoin,
-    updating,
     getCoinStats,
     originCoinDepositMax,
     originCoinDepositMin,
@@ -51,7 +49,7 @@ export default (props: Props) => {
         prefix={__('Exchange')}
         postfix={__('for LBC')}
         type="select"
-        name="origin_coin"
+        name="originCoin"
         onChange={e => {
           getCoinStats(e.target.value);
           handleChange(e);
@@ -76,7 +74,7 @@ export default (props: Props) => {
           label={__('Return address')}
           error={touched.returnAddress && !!errors.returnAddress && errors.returnAddress}
           type="text"
-          name="return_address"
+          name="returnAddress"
           className="input--address"
           placeholder={getExampleAddress(originCoin)}
           onChange={handleChange}
diff --git a/src/renderer/component/sideBar/index.js b/src/renderer/component/sideBar/index.js
index 124d8466a..12c0de26b 100644
--- a/src/renderer/component/sideBar/index.js
+++ b/src/renderer/component/sideBar/index.js
@@ -1,10 +1,6 @@
 import { connect } from 'react-redux';
 import { doNavigate, doHistoryBack, doHistoryForward } from 'redux/actions/navigation';
-import {
-  selectIsBackDisabled,
-  selectIsForwardDisabled,
-  selectNavLinks,
-} from 'redux/selectors/navigation';
+import { selectIsBackDisabled, selectIsForwardDisabled, selectNavLinks } from 'lbry-redux';
 import { selectNotifications } from 'redux/selectors/subscriptions';
 import SideBar from './view';
 
diff --git a/src/renderer/component/snackBar/index.js b/src/renderer/component/snackBar/index.js
index 9600fdd68..fc5cbf57e 100644
--- a/src/renderer/component/snackBar/index.js
+++ b/src/renderer/component/snackBar/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { doRemoveSnackBarSnack } from 'redux/actions/app';
 import { selectSnackBarSnacks } from 'redux/selectors/app';
diff --git a/src/renderer/component/snackBar/view.jsx b/src/renderer/component/snackBar/view.jsx
index 38867c811..0fdfeef3f 100644
--- a/src/renderer/component/snackBar/view.jsx
+++ b/src/renderer/component/snackBar/view.jsx
@@ -1,35 +1,48 @@
+// @flow
 import React from 'react';
 import Button from 'component/button';
 
-class SnackBar extends React.PureComponent {
-  constructor(props) {
+type Props = {
+  removeSnack: any => void,
+  snacks: {
+    linkTarget: ?string,
+    linkText: ?string,
+    message: string,
+  },
+};
+
+class SnackBar extends React.PureComponent<Props> {
+  constructor(props: Props) {
     super(props);
 
-    this._displayTime = 5; // in seconds
-    this._hideTimeout = null;
+    this.displayTime = 5; // in seconds
+    this.hideTimeout = null;
   }
 
   render() {
     const { snacks, removeSnack } = this.props;
 
     if (!snacks.length) {
-      this._hideTimeout = null; // should be unmounting anyway, but be safe?
+      this.hideTimeout = null; // should be unmounting anyway, but be safe?
       return null;
     }
 
     const snack = snacks[0];
     const { message, linkText, linkTarget } = snack;
 
-    if (this._hideTimeout === null) {
-      this._hideTimeout = setTimeout(() => {
-        this._hideTimeout = null;
+    if (this.hideTimeout === null) {
+      this.hideTimeout = setTimeout(() => {
+        this.hideTimeout = null;
         removeSnack();
-      }, this._displayTime * 1000);
+      }, this.displayTime * 1000);
     }
 
     return (
       <div className="snack-bar">
-        {message}
+        <div className="snack-bar__message">
+          <div>&#9432;</div>
+          <div>{message}</div>
+        </div>
         {linkText &&
           linkTarget && (
             <Button navigate={linkTarget} className="snack-bar__action" label={linkText} />
diff --git a/src/renderer/component/splash/view.jsx b/src/renderer/component/splash/view.jsx
index 89c5c82f4..bdbadc247 100644
--- a/src/renderer/component/splash/view.jsx
+++ b/src/renderer/component/splash/view.jsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import lbry from 'lbry';
+import { Lbry } from 'lbry-redux';
 import LoadScreen from './internal/load-screen';
 import ModalIncompatibleDaemon from 'modal/modalIncompatibleDaemon';
 import ModalUpgrade from 'modal/modalUpgrade';
@@ -31,7 +31,7 @@ export class SplashScreen extends React.PureComponent<Props, State> {
   }
 
   updateStatus() {
-    lbry.status().then(status => {
+    Lbry.status().then(status => {
       this._updateStatusCallback(status);
     });
   }
@@ -50,7 +50,7 @@ export class SplashScreen extends React.PureComponent<Props, State> {
         isRunning: true,
       });
 
-      lbry.resolve({ uri: 'lbry://one' }).then(() => {
+      Lbry.resolve({ uri: 'lbry://one' }).then(() => {
         // Only leave the load screen if the daemon version matched;
         // otherwise we'll notify the user at the end of the load screen.
 
@@ -83,8 +83,7 @@ export class SplashScreen extends React.PureComponent<Props, State> {
   componentDidMount() {
     const { checkDaemonVersion } = this.props;
 
-    lbry
-      .connect()
+    Lbry.connect()
       .then(checkDaemonVersion)
       .then(() => {
         this.updateStatus();
diff --git a/src/renderer/component/subHeader/index.js b/src/renderer/component/subHeader/index.js
deleted file mode 100644
index f445734c5..000000000
--- a/src/renderer/component/subHeader/index.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { selectCurrentPage, selectHeaderLinks } from 'redux/selectors/navigation';
-import { doNavigate } from 'redux/actions/navigation';
-import { selectNotifications } from 'redux/selectors/subscriptions';
-import SubHeader from './view';
-
-const select = (state, props) => ({
-  currentPage: selectCurrentPage(state),
-  subLinks: selectHeaderLinks(state),
-  notifications: selectNotifications(state),
-});
-
-const perform = dispatch => ({
-  navigate: path => dispatch(doNavigate(path)),
-});
-
-export default connect(select, perform)(SubHeader);
diff --git a/src/renderer/component/subHeader/view.jsx b/src/renderer/component/subHeader/view.jsx
deleted file mode 100644
index 8ede92169..000000000
--- a/src/renderer/component/subHeader/view.jsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import React from 'react';
-import Link from 'component/link';
-import classnames from 'classnames';
-import * as NOTIFICATION_TYPES from 'constants/notification_types';
-
-const SubHeader = props => {
-  const { subLinks, currentPage, navigate, fullWidth, smallMargin, notifications } = props;
-
-  const badges = Object.keys(notifications).reduce(
-    (acc, cur) => (notifications[cur].type === NOTIFICATION_TYPES.DOWNLOADING ? acc : acc + 1),
-    0
-  );
-
-  const links = [];
-
-  for (const link of Object.keys(subLinks)) {
-    links.push(
-      <Link
-        onClick={event => navigate(`/${link}`, event)}
-        key={link}
-        className={link == currentPage ? 'sub-header-selected' : 'sub-header-unselected'}
-      >
-        {subLinks[link] === 'Subscriptions' && badges
-          ? `Subscriptions (${badges})`
-          : subLinks[link]}
-      </Link>
-    );
-  }
-
-  return (
-    <nav
-      className={classnames('sub-header', {
-        'sub-header--full-width': fullWidth,
-        'sub-header--small-margin': smallMargin,
-      })}
-    >
-      {links}
-    </nav>
-  );
-};
-
-export default SubHeader;
diff --git a/src/renderer/component/theme/view.jsx b/src/renderer/component/theme/view.jsx
index e998d6d20..bac5410d8 100644
--- a/src/renderer/component/theme/view.jsx
+++ b/src/renderer/component/theme/view.jsx
@@ -3,15 +3,11 @@ import React from 'react';
 const Theme = props => {
   const { themePath } = props;
 
-  // Force light mode while until dark mode is ready
-  // This is so we don't have to change users settings for them
-  return null;
+  if (!themePath) {
+    return null;
+  }
 
-  // if (!themePath) {
-  //   return null;
-  // }
-  //
-  // return <link href={themePath} rel="stylesheet" type="text/css" media="screen,print" />;
+  return <link href={themePath} rel="stylesheet" type="text/css" media="screen,print" />;
 };
 
 export default Theme;
diff --git a/src/renderer/component/transactionList/index.js b/src/renderer/component/transactionList/index.js
index 54b7b755f..22b2e58ba 100644
--- a/src/renderer/component/transactionList/index.js
+++ b/src/renderer/component/transactionList/index.js
@@ -1,9 +1,8 @@
-import React from 'react';
 import { connect } from 'react-redux';
+import { selectClaimedRewardsByTransactionId } from 'redux/selectors/rewards';
 import { doNavigate } from 'redux/actions/navigation';
 import { doOpenModal } from 'redux/actions/app';
-import { selectClaimedRewardsByTransactionId } from 'redux/selectors/rewards';
-import { selectAllMyClaimsByOutpoint } from 'redux/selectors/claims';
+import { selectAllMyClaimsByOutpoint } from 'lbry-redux';
 import TransactionList from './view';
 
 const select = state => ({
diff --git a/src/renderer/component/transactionList/internal/transaction-list-item.jsx b/src/renderer/component/transactionList/internal/transaction-list-item.jsx
index c713be1c8..264db8669 100644
--- a/src/renderer/component/transactionList/internal/transaction-list-item.jsx
+++ b/src/renderer/component/transactionList/internal/transaction-list-item.jsx
@@ -4,7 +4,7 @@ import ButtonTransaction from 'component/common/transaction-link';
 import CreditAmount from 'component/common/credit-amount';
 import DateTime from 'component/dateTime';
 import Button from 'component/button';
-import { buildURI } from 'lbryURI';
+import { buildURI } from 'lbry-redux';
 import * as txnTypes from 'constants/transaction_types';
 import type { Transaction } from '../view';
 
diff --git a/src/renderer/component/transactionListRecent/index.js b/src/renderer/component/transactionListRecent/index.js
index c01590705..3a59bc82f 100644
--- a/src/renderer/component/transactionListRecent/index.js
+++ b/src/renderer/component/transactionListRecent/index.js
@@ -1,13 +1,10 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doFetchTransactions } from 'redux/actions/wallet';
 import {
-  selectBalance,
+  doFetchTransactions,
   selectRecentTransactions,
   selectHasTransactions,
   selectIsFetchingTransactions,
-} from 'redux/selectors/wallet';
-
+} from 'lbry-redux';
 import TransactionListRecent from './view';
 
 const select = state => ({
diff --git a/src/renderer/component/uriIndicator/index.js b/src/renderer/component/uriIndicator/index.js
index 298a90696..8524965d5 100644
--- a/src/renderer/component/uriIndicator/index.js
+++ b/src/renderer/component/uriIndicator/index.js
@@ -1,9 +1,10 @@
-import React from 'react';
-import { normalizeURI } from 'lbryURI';
 import { connect } from 'react-redux';
-import { doResolveUri } from 'redux/actions/content';
-import { makeSelectIsUriResolving } from 'redux/selectors/content';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import {
+  normalizeURI,
+  doResolveUri,
+  makeSelectIsUriResolving,
+  makeSelectClaimForUri,
+} from 'lbry-redux';
 import UriIndicator from './view';
 
 const select = (state, props) => ({
diff --git a/src/renderer/component/uriIndicator/view.jsx b/src/renderer/component/uriIndicator/view.jsx
index b4e3b3707..499b11fba 100644
--- a/src/renderer/component/uriIndicator/view.jsx
+++ b/src/renderer/component/uriIndicator/view.jsx
@@ -1,7 +1,7 @@
 // @flow
 import React from 'react';
 import Button from 'component/button';
-import { buildURI } from 'lbryURI';
+import { buildURI } from 'lbry-redux';
 import classnames from 'classnames';
 // import Icon from 'component/common/icon';
 
diff --git a/src/renderer/component/userPhoneNew/view.jsx b/src/renderer/component/userPhoneNew/view.jsx
index fefd640de..dff273299 100644
--- a/src/renderer/component/userPhoneNew/view.jsx
+++ b/src/renderer/component/userPhoneNew/view.jsx
@@ -1,7 +1,7 @@
 // I'll come back to this
 /* eslint-disable */
 import React from 'react';
-import { Form, FormRow, FormField } from 'component/common/form';
+import { Form, FormRow, FormField, Submit } from 'component/common/form';
 
 const os = require('os').type();
 const countryCodes = require('country-data')
@@ -77,37 +77,30 @@ class UserPhoneNew extends React.PureComponent {
           )}
         </p>
         <Form onSubmit={this.handleSubmit.bind(this)}>
-          <div className="form-row-phone">
+          <FormRow>
+            <FormField type="select" name="country-codes" onChange={this.handleSelect.bind(this)}>
+              {countryCodes.map((country, index) => (
+                <option key={index} value={country.countryCallingCode}>
+                  {os === 'Darwin' ? country.emoji : `(${country.alpha2})`}{' '}
+                  {country.countryCallingCode}
+                </option>
+              ))}
+            </FormField>
             <FormField
-              onChange={this.handleSelect.bind(this)}
-              render={() => (
-                <select>
-                  {countryCodes.map((country, index) => (
-                    <option key={index} value={country.countryCallingCode}>
-                      {os === 'Darwin' ? country.emoji : `(${country.alpha2})`}{' '}
-                      {country.countryCallingCode}
-                    </option>
-                  ))}
-                </select>
-              )}
-            />
-            <FormField
-              errorMessage={phoneErrorMessage}
+              type="text"
+              placeholder={this.state.country_code === '+1' ? '(555) 555-5555' : '5555555555'}
+              name="phone"
+              value={this.state.phone}
+              error={phoneErrorMessage}
               onChange={event => {
                 this.handleChanged(event);
               }}
-              render={() => (
-                <input
-                  type="text"
-                  placeholder={this.state.country_code === '+1' ? '(555) 555-5555' : '5555555555'}
-                  name="phone"
-                  value={this.state.phone}
-                />
-              )}
             />
+          </FormRow>
+          <div className="card__actions card__actions--center">
+            <Submit label="Submit" disabled={isPending} />
+            {cancelButton}
           </div>
-          <Submit label="Submit" disabled={isPending} />
-          {cancelButton}
         </Form>
       </div>
     );
diff --git a/src/renderer/component/userPhoneVerify/view.jsx b/src/renderer/component/userPhoneVerify/view.jsx
index 7e038da06..a859adffe 100644
--- a/src/renderer/component/userPhoneVerify/view.jsx
+++ b/src/renderer/component/userPhoneVerify/view.jsx
@@ -2,7 +2,7 @@
 /* eslint-disable */
 import React from 'react';
 import Button from 'component/button';
-import { Form, FormElement, Submit } from 'component/common/form';
+import { Form, FormField, Submit } from 'component/common/form';
 
 class UserPhoneVerify extends React.PureComponent {
   constructor(props) {
@@ -37,31 +37,27 @@ class UserPhoneVerify extends React.PureComponent {
           {__(
             `Please enter the verification code sent to +${countryCode}${phone}. Didn't receive it? `
           )}
-          <Button onClick={this.reset.bind(this)} label="Go back." />
+          <Button button="link" onClick={this.reset.bind(this)} label="Go back." />
         </p>
-        <FormElement
+        <FormField
+          type="text"
+          name="code"
+          value={this.state.code}
+          onChange={event => {
+            this.handleCodeChanged(event);
+          }}
           label={__('Verification Code')}
-          errorMessage={phoneErrorMessage}
-          render={() => (
-            <input
-              type="text"
-              name="code"
-              value={this.state.code}
-              onChange={event => {
-                this.handleCodeChanged(event);
-              }}
-            />
-          )}
+          error={phoneErrorMessage}
         />
         {/* render help separately so it always shows */}
-        <div className="form-field__helper">
+        <div className="meta">
           <p>
-            {__('Email')} <Button href="mailto:help@lbry.io" label="help@lbry.io" /> or join our{' '}
-            <Button href="https://chat.lbry.io" label="chat" />{' '}
+            {__('Email')} <Button button="link" href="mailto:help@lbry.io" label="help@lbry.io" />{' '}
+            or join our <Button button="link" href="https://chat.lbry.io" label="chat" />{' '}
             {__('if you encounter any trouble with your code.')}
           </p>
         </div>
-        <div className="form-row-submit">
+        <div className="card__actions card__actions--center">
           <Submit label={__('Verify')} />
           {cancelButton}
         </div>
diff --git a/src/renderer/component/userVerify/index.js b/src/renderer/component/userVerify/index.js
index bf0a4f6e1..e5ad16583 100644
--- a/src/renderer/component/userVerify/index.js
+++ b/src/renderer/component/userVerify/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { doNavigate } from 'redux/actions/navigation';
 import { doUserIdentityVerify } from 'redux/actions/user';
diff --git a/src/renderer/component/userVerify/view.jsx b/src/renderer/component/userVerify/view.jsx
index 4e730a986..70c9afd7e 100644
--- a/src/renderer/component/userVerify/view.jsx
+++ b/src/renderer/component/userVerify/view.jsx
@@ -1,31 +1,31 @@
-/* eslint-disable */
-import React from 'react';
+// @flow
+import * as React from 'react';
 import Button from 'component/button';
 import CardVerify from 'component/cardVerify';
-import lbryio from 'lbryio.js';
+import lbryio from 'lbryio';
 import * as icons from 'constants/icons';
 
-class UserVerify extends React.PureComponent {
-  constructor(props) {
-    super(props);
+type Props = {
+  errorMessage: ?string,
+  isPending: boolean,
+  navigate: string => void,
+  verifyUserIdentity: string => void,
+  verifyPhone: () => void,
+};
 
-    this.state = {
-      code: '',
-    };
+class UserVerify extends React.PureComponent<Props> {
+  constructor() {
+    super();
+
+    (this: any).onToken = this.onToken.bind(this);
   }
 
-  handleCodeChanged(event) {
-    this.setState({
-      code: event.target.value,
-    });
-  }
-
-  onToken(data) {
+  onToken(data: { id: string }) {
     this.props.verifyUserIdentity(data.id);
   }
 
   render() {
-    const { errorMessage, isPending, navigate, verifyPhone, modal } = this.props;
+    const { errorMessage, isPending, navigate, verifyPhone } = this.props;
     return (
       <React.Fragment>
         <section className="card card--section">
@@ -39,20 +39,18 @@ class UserVerify extends React.PureComponent {
           </div>
         </section>
         <section className="card card--section">
-          <div className="card__title">
-            <h3>{__('1) Proof via Credit')}</h3>
-          </div>
-          <div className="card__content">
+          <div className="card__title">{__('1) Proof via Credit')}</div>
+          <p className="card__content">
             {`${__(
               'If you have a valid credit or debit card, you can use it to instantly prove your humanity.'
             )} ${__('There is no charge at all for this, now or in the future.')} `}
-          </div>
+          </p>
           <div className="card__actions">
             {errorMessage && <p className="form-field__error">{errorMessage}</p>}
             <CardVerify
               label={__('Perform Card Verification')}
               disabled={isPending}
-              token={this.onToken.bind(this)}
+              token={this.onToken}
               stripeKey={lbryio.getStripeToken()}
             />
           </div>
@@ -60,6 +58,7 @@ class UserVerify extends React.PureComponent {
             <div className="meta">
               {__('A $1 authorization may temporarily appear with your provider.')}{' '}
               <Button
+                button="link"
                 href="https://lbry.io/faq/identity-requirements"
                 label={__('Read more about why we do this.')}
               />
@@ -67,20 +66,18 @@ class UserVerify extends React.PureComponent {
           </div>
         </section>
         <section className="card card--section">
-          <div className="card__title">
-            <h3>{__('2) Proof via Phone')}</h3>
-          </div>
-          <div className="card__content">
+          <div className="card__title">{__('2) Proof via Phone')}</div>
+          <p className="card__content">
             {`${__(
               'You will receive an SMS text message confirming that your phone number is correct.'
             )}`}
-          </div>
+          </p>
           <div className="card__actions">
             <Button
               onClick={() => {
                 verifyPhone();
               }}
-              button="alt"
+              button="primary"
               icon={icons.PHONE}
               label={__('Submit Phone Number')}
             />
@@ -88,14 +85,12 @@ class UserVerify extends React.PureComponent {
           <div className="card__content">
             <div className="meta">
               {__('Standard messaging rates apply. Having trouble?')}{' '}
-              <Button href="https://lbry.io/faq/phone" label={__('Read more.')} />
+              <Button button="link" href="https://lbry.io/faq/phone" label={__('Read more.')} />
             </div>
           </div>
         </section>
-        <section className="card card--form">
-          <div className="card__title">
-            <h3>{__('3) Proof via Chat')}</h3>
-          </div>
+        <section className="card card--section">
+          <div className="card__title">{__('3) Proof via Chat')}</div>
           <div className="card__content">
             <p>
               {__(
@@ -111,25 +106,25 @@ class UserVerify extends React.PureComponent {
           <div className="card__actions">
             <Button
               href="https://chat.lbry.io"
-              button="alt"
+              button="primary"
               icon={icons.MESSAGE}
               label={__('Join LBRY Chat')}
             />
           </div>
         </section>
         <section className="card card--section">
-          <div className="card__title">
-            <h5>{__('Or, Skip It Entirely')}</h5>
-          </div>
-          <div className="card__content">
-            <p className="meta">
-              {__(
-                'You can continue without this step, but you will not be eligible to earn rewards.'
-              )}
-            </p>
-          </div>
+          <div className="card__title">{__('Or, Skip It Entirely')}</div>
+          <p className="card__content">
+            {__(
+              'You can continue without this step, but you will not be eligible to earn rewards.'
+            )}
+          </p>
           <div className="card__actions">
-            <Button onClick={() => navigate('/discover')} button="alt" label={__('Skip Rewards')} />
+            <Button
+              onClick={() => navigate('/discover')}
+              button="primary"
+              label={__('Skip Rewards')}
+            />
           </div>
         </section>
       </React.Fragment>
@@ -138,4 +133,3 @@ class UserVerify extends React.PureComponent {
 }
 
 export default UserVerify;
-/* eslint-enable */
diff --git a/src/renderer/component/video/index.js b/src/renderer/component/video/index.js
index 573dba1a9..671f931be 100644
--- a/src/renderer/component/video/index.js
+++ b/src/renderer/component/video/index.js
@@ -1,21 +1,21 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { doChangeVolume } from 'redux/actions/app';
 import { selectVolume } from 'redux/selectors/app';
 import { doPlayUri, doSetPlayingUri } from 'redux/actions/content';
 import { doPlay, doPause, savePosition } from 'redux/actions/media';
-import { makeSelectMetadataForUri, makeSelectContentTypeForUri } from 'redux/selectors/claims';
 import {
+  makeSelectMetadataForUri,
+  makeSelectContentTypeForUri,
+  makeSelectCostInfoForUri,
+  makeSelectClaimForUri,
   makeSelectFileInfoForUri,
   makeSelectLoadingForUri,
   makeSelectDownloadingForUri,
-} from 'redux/selectors/file_info';
-import { makeSelectCostInfoForUri } from 'redux/selectors/cost_info';
+} from 'lbry-redux';
 import { selectShowNsfw } from 'redux/selectors/settings';
 import { selectMediaPaused, makeSelectMediaPositionForUri } from 'redux/selectors/media';
-import Video from './view';
 import { selectPlayingUri } from 'redux/selectors/content';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import Video from './view';
 
 const select = (state, props) => ({
   claim: makeSelectClaimForUri(props.uri)(state),
diff --git a/src/renderer/component/video/view.jsx b/src/renderer/component/video/view.jsx
index 965bedd03..1cfda4078 100644
--- a/src/renderer/component/video/view.jsx
+++ b/src/renderer/component/video/view.jsx
@@ -1,6 +1,6 @@
 // @flow
 import React from 'react';
-import lbry from 'lbry';
+import { Lbry } from 'lbry-redux';
 import classnames from 'classnames';
 import VideoPlayer from './internal/player';
 import VideoPlayButton from './internal/play-button';
@@ -75,7 +75,7 @@ class Video extends React.PureComponent<Props> {
     const isPlaying = playingUri === uri;
     const isReadyToPlay = fileInfo && fileInfo.written_bytes > 0;
     const shouldObscureNsfw = obscureNsfw && metadata && metadata.nsfw;
-    const mediaType = lbry.getMediaType(contentType, fileInfo && fileInfo.file_name);
+    const mediaType = Lbry.getMediaType(contentType, fileInfo && fileInfo.file_name);
 
     let loadStatusMessage = '';
 
diff --git a/src/renderer/component/walletAddress/index.js b/src/renderer/component/walletAddress/index.js
index 738892973..8955c6651 100644
--- a/src/renderer/component/walletAddress/index.js
+++ b/src/renderer/component/walletAddress/index.js
@@ -1,7 +1,10 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doCheckAddressIsMine, doGetNewAddress } from 'redux/actions/wallet';
-import { selectReceiveAddress, selectGettingNewAddress } from 'redux/selectors/wallet';
+import {
+  doCheckAddressIsMine,
+  doGetNewAddress,
+  selectReceiveAddress,
+  selectGettingNewAddress,
+} from 'lbry-redux';
 import WalletAddress from './view';
 
 const select = state => ({
diff --git a/src/renderer/component/walletBalance/index.js b/src/renderer/component/walletBalance/index.js
index 0e1b4439c..9f69e655b 100644
--- a/src/renderer/component/walletBalance/index.js
+++ b/src/renderer/component/walletBalance/index.js
@@ -1,6 +1,5 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { selectBalance } from 'redux/selectors/wallet';
+import { selectBalance } from 'lbry-redux';
 import WalletBalance from './view';
 
 const select = state => ({
diff --git a/src/renderer/component/walletSend/index.js b/src/renderer/component/walletSend/index.js
index 2643c5b57..44a743ef1 100644
--- a/src/renderer/component/walletSend/index.js
+++ b/src/renderer/component/walletSend/index.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
-import { doSendDraftTransaction } from 'redux/actions/wallet';
-import { selectBalance } from 'redux/selectors/wallet';
+import { doSendDraftTransaction, selectBalance } from 'lbry-redux';
 import WalletSend from './view';
 
 const perform = dispatch => ({
diff --git a/src/renderer/component/walletSend/view.jsx b/src/renderer/component/walletSend/view.jsx
index 4a124527a..f8ff9c8e6 100644
--- a/src/renderer/component/walletSend/view.jsx
+++ b/src/renderer/component/walletSend/view.jsx
@@ -51,6 +51,7 @@ class WalletSend extends React.PureComponent<Props> {
                     postfix={__('LBC')}
                     className="input--price-amount"
                     min="0"
+                    step="any"
                     onChange={handleChange}
                     onBlur={handleBlur}
                     value={values.amount}
diff --git a/src/renderer/component/walletSendTip/index.js b/src/renderer/component/walletSendTip/index.js
index 7677f0a7a..dc304f2e7 100644
--- a/src/renderer/component/walletSendTip/index.js
+++ b/src/renderer/component/walletSendTip/index.js
@@ -1,7 +1,10 @@
 import { connect } from 'react-redux';
-import { doSendSupport } from 'redux/actions/wallet';
-import { makeSelectTitleForUri, makeSelectClaimForUri } from 'redux/selectors/claims';
-import { selectIsSendingSupport } from 'redux/selectors/wallet';
+import {
+  doSendSupport,
+  makeSelectTitleForUri,
+  makeSelectClaimForUri,
+  selectIsSendingSupport,
+} from 'lbry-redux';
 import WalletSendTip from './view';
 
 const select = (state, props) => ({
diff --git a/src/renderer/component/wunderbar/index.js b/src/renderer/component/wunderbar/index.js
index 9491c46f3..a694e5508 100644
--- a/src/renderer/component/wunderbar/index.js
+++ b/src/renderer/component/wunderbar/index.js
@@ -1,8 +1,11 @@
 import * as MODALS from 'constants/modal_types';
 import { connect } from 'react-redux';
-import { normalizeURI } from 'lbryURI';
-import { selectState as selectSearch, selectWunderBarAddress } from 'redux/selectors/search';
-import { doUpdateSearchQuery } from 'redux/actions/search';
+import { normalizeURI } from 'lbry-redux';
+import {
+  selectSearchState as selectSearch,
+  selectWunderBarAddress,
+  doUpdateSearchQuery,
+} from 'lbry-redux';
 import { doNavigate } from 'redux/actions/navigation';
 import { doOpenModal } from 'redux/actions/app';
 import Wunderbar from './view';
diff --git a/src/renderer/component/wunderbar/view.jsx b/src/renderer/component/wunderbar/view.jsx
index 583ed54e6..74549bbbd 100644
--- a/src/renderer/component/wunderbar/view.jsx
+++ b/src/renderer/component/wunderbar/view.jsx
@@ -1,7 +1,7 @@
 // @flow
 import React from 'react';
 import classnames from 'classnames';
-import { normalizeURI } from 'lbryURI';
+import { normalizeURI } from 'lbry-redux';
 import Icon from 'component/common/icon';
 import { parseQueryParams } from 'util/query_params';
 import * as icons from 'constants/icons';
diff --git a/src/renderer/jsonrpc.js b/src/renderer/jsonrpc.js
deleted file mode 100644
index 184065122..000000000
--- a/src/renderer/jsonrpc.js
+++ /dev/null
@@ -1,86 +0,0 @@
-const jsonrpc = {};
-
-jsonrpc.call = (
-  connectionString,
-  method,
-  params,
-  callback,
-  errorCallback,
-  connectFailedCallback
-) => {
-  function checkAndParse(response) {
-    if (response.status >= 200 && response.status < 300) {
-      return response.json();
-    }
-    return response.json().then(json => {
-      let error;
-      if (json.error) {
-        error = new Error(json.error.message);
-      } else {
-        error = new Error('Protocol error with unknown response signature');
-      }
-      return Promise.reject(error);
-    });
-  }
-
-  const counter = parseInt(sessionStorage.getItem('JSONRPCCounter') || 0, 10);
-  const url = connectionString;
-  const options = {
-    method: 'POST',
-    body: JSON.stringify({
-      jsonrpc: '2.0',
-      method,
-      params,
-      id: counter,
-    }),
-  };
-
-  sessionStorage.setItem('JSONRPCCounter', counter + 1);
-
-  return fetch(url, options)
-    .then(checkAndParse)
-    .then(response => {
-      const error = response.error || (response.result && response.result.error);
-
-      if (!error && typeof callback === 'function') {
-        return callback(response.result);
-      }
-
-      if (error && typeof errorCallback === 'function') {
-        return errorCallback(error);
-      }
-
-      const errorEvent = new CustomEvent('unhandledError', {
-        detail: {
-          connectionString,
-          method,
-          params,
-          code: error.code,
-          message: error.message || error,
-          data: error.data,
-        },
-      });
-      document.dispatchEvent(errorEvent);
-
-      return Promise.resolve();
-    })
-    .catch(error => {
-      if (connectFailedCallback) {
-        return connectFailedCallback(error);
-      }
-
-      const errorEvent = new CustomEvent('unhandledError', {
-        detail: {
-          connectionString,
-          method,
-          params,
-          code: error.response && error.response.status,
-          message: __('Connection to API server failed'),
-        },
-      });
-      document.dispatchEvent(errorEvent);
-      return Promise.resolve();
-    });
-};
-
-export default jsonrpc;
diff --git a/src/renderer/lbry.js b/src/renderer/lbry.js
deleted file mode 100644
index 8da232e24..000000000
--- a/src/renderer/lbry.js
+++ /dev/null
@@ -1,151 +0,0 @@
-import { ipcRenderer } from 'electron';
-import jsonrpc from 'jsonrpc';
-
-const CHECK_DAEMON_STARTED_TRY_NUMBER = 200;
-
-const Lbry = {
-  isConnected: false,
-  daemonConnectionString: 'http://localhost:5279',
-  pendingPublishTimeout: 20 * 60 * 1000,
-};
-
-function apiCall(method, params, resolve, reject) {
-  return jsonrpc.call(Lbry.daemonConnectionString, method, params, resolve, reject, reject);
-}
-
-const lbryProxy = new Proxy(Lbry, {
-  get(target, name) {
-    if (name in target) {
-      return target[name];
-    }
-
-    return (params = {}) =>
-      new Promise((resolve, reject) => {
-        apiCall(name, params, resolve, reject);
-      });
-  },
-});
-
-function getLocal(key, fallback = undefined) {
-  const itemRaw = localStorage.getItem(key);
-  return itemRaw === null ? fallback : JSON.parse(itemRaw);
-}
-
-function setLocal(key, value) {
-  localStorage.setItem(key, JSON.stringify(value));
-}
-
-// core
-Lbry.connectPromise = null;
-Lbry.connect = () => {
-  if (Lbry.connectPromise === null) {
-    Lbry.connectPromise = new Promise((resolve, reject) => {
-      let tryNum = 0;
-
-      // Check every half second to see if the daemon is accepting connections
-      function checkDaemonStarted() {
-        tryNum += 1;
-        lbryProxy
-          .status()
-          .then(resolve)
-          .catch(() => {
-            if (tryNum <= CHECK_DAEMON_STARTED_TRY_NUMBER) {
-              setTimeout(checkDaemonStarted, tryNum < 50 ? 400 : 1000);
-            } else {
-              reject(new Error('Unable to connect to LBRY'));
-            }
-          });
-      }
-
-      checkDaemonStarted();
-    });
-  }
-
-  return Lbry.connectPromise;
-};
-
-Lbry.imagePath = file => `${staticResourcesPath}/img/${file}`;
-
-Lbry.getAppVersionInfo = () =>
-  new Promise(resolve => {
-    ipcRenderer.once('version-info-received', (event, versionInfo) => {
-      resolve(versionInfo);
-    });
-    ipcRenderer.send('version-info-requested');
-  });
-
-Lbry.getMediaType = (contentType, fileName) => {
-  if (contentType) {
-    return /^[^/]+/.exec(contentType)[0];
-  } else if (fileName) {
-    const dotIndex = fileName.lastIndexOf('.');
-    if (dotIndex === -1) {
-      return 'unknown';
-    }
-
-    const ext = fileName.substr(dotIndex + 1);
-    if (/^mp4|m4v|webm|flv|f4v|ogv$/i.test(ext)) {
-      return 'video';
-    } else if (/^mp3|m4a|aac|wav|flac|ogg|opus$/i.test(ext)) {
-      return 'audio';
-    } else if (/^html|htm|xml|pdf|odf|doc|docx|md|markdown|txt|epub|org$/i.test(ext)) {
-      return 'document';
-    }
-    return 'unknown';
-  }
-  return 'unknown';
-};
-
-/**
- * Wrappers for API methods to simulate missing or future behavior. Unlike the old-style stubs,
- * these are designed to be transparent wrappers around the corresponding API methods.
- */
-
-/**
- * Returns results from the file_list API method, plus dummy entries for pending publishes.
- * (If a real publish with the same claim name is found, the pending publish will be ignored and removed.)
- */
-Lbry.file_list = (params = {}) =>
-  new Promise((resolve, reject) => {
-    const { claim_name: claimName, channel_name: channelName, outpoint } = params;
-
-    apiCall(
-      'file_list',
-      params,
-      fileInfos => {
-        resolve(fileInfos);
-      },
-      reject
-    );
-  });
-
-Lbry.claim_list_mine = (params = {}) =>
-  new Promise((resolve, reject) => {
-    apiCall(
-      'claim_list_mine',
-      params,
-      claims => {
-        resolve(claims);
-      },
-      reject
-    );
-  });
-
-Lbry.resolve = (params = {}) =>
-  new Promise((resolve, reject) => {
-    apiCall(
-      'resolve',
-      params,
-      data => {
-        if ('uri' in params) {
-          // If only a single URI was requested, don't nest the results in an object
-          resolve(data && data[params.uri] ? data[params.uri] : {});
-        } else {
-          resolve(data || {});
-        }
-      },
-      reject
-    );
-  });
-
-export default lbryProxy;
diff --git a/src/renderer/lbryURI.js b/src/renderer/lbryURI.js
deleted file mode 100644
index 9fd136b92..000000000
--- a/src/renderer/lbryURI.js
+++ /dev/null
@@ -1,230 +0,0 @@
-const channelNameMinLength = 1;
-const claimIdMaxLength = 40;
-
-export const regexInvalidURI = /[^A-Za-z0-9-]/g;
-export const regexAddress = /^b(?=[^0OIl]{32,33})[0-9A-Za-z]{32,33}$/;
-
-/**
- * Parses a LBRY name into its component parts. Throws errors with user-friendly
- * messages for invalid names.
- *
- * N.B. that "name" indicates the value in the name position of the URI. For
- * claims for channel content, this will actually be the channel name, and
- * the content name is in the path (e.g. lbry://@channel/content)
- *
- * In most situations, you'll want to use the contentName and channelName keys
- * and ignore the name key.
- *
- * Returns a dictionary with keys:
- *   - name (string): The value in the "name" position in the URI. Note that this
- *                    could be either content name or channel name; see above.
- *   - path (string, if persent)
- *   - claimSequence (int, if present)
- *   - bidPosition (int, if present)
- *   - claimId (string, if present)
- *   - isChannel (boolean)
- *   - contentName (string): For anon claims, the name; for channel claims, the path
- *   - channelName (string, if present): Channel name without @
- */
-export function parseURI(URI, requireProto = false) {
-  // Break into components. Empty sub-matches are converted to null
-  const componentsRegex = new RegExp(
-    '^((?:lbry://)?)' + // protocol
-    '([^:$#/]*)' + // claim name (stops at the first separator or end)
-    '([:$#]?)([^/]*)' + // modifier separator, modifier (stops at the first path separator or end)
-      '(/?)(.*)' // path separator, path
-  );
-  const [proto, claimName, modSep, modVal, pathSep, path] = componentsRegex
-    .exec(URI)
-    .slice(1)
-    .map(match => match || null);
-
-  let contentName;
-
-  // Validate protocol
-  if (requireProto && !proto) {
-    throw new Error(__('LBRY URIs must include a protocol prefix (lbry://).'));
-  }
-
-  // Validate and process name
-  if (!claimName) {
-    throw new Error(__('URI does not include name.'));
-  }
-
-  const isChannel = claimName.startsWith('@');
-  const channelName = isChannel ? claimName.slice(1) : claimName;
-
-  if (isChannel) {
-    if (!channelName) {
-      throw new Error(__('No channel name after @.'));
-    }
-
-    if (channelName.length < channelNameMinLength) {
-      throw new Error(__(`Channel names must be at least %s characters.`, channelNameMinLength));
-    }
-
-    contentName = path;
-  }
-
-  const nameBadChars = (channelName || claimName).match(regexInvalidURI);
-  if (nameBadChars) {
-    throw new Error(
-      __(
-        `Invalid character %s in name: %s.`,
-        nameBadChars.length === 1 ? '' : 's',
-        nameBadChars.join(', ')
-      )
-    );
-  }
-
-  // Validate and process modifier (claim ID, bid position or claim sequence)
-  let claimId;
-  let claimSequence;
-  let bidPosition;
-  if (modSep) {
-    if (!modVal) {
-      throw new Error(__(`No modifier provided after separator %s.`, modSep));
-    }
-
-    if (modSep === '#') {
-      claimId = modVal;
-    } else if (modSep === ':') {
-      claimSequence = modVal;
-    } else if (modSep === '$') {
-      bidPosition = modVal;
-    }
-  }
-
-  if (
-    claimId &&
-    (claimId.length > claimIdMaxLength || !claimId.match(/^[0-9a-f]+$/)) &&
-    !claimId.match(/^pending/) // ought to be dropped when savePendingPublish drops hack
-  ) {
-    throw new Error(__(`Invalid claim ID %s.`, claimId));
-  }
-
-  if (claimSequence && !claimSequence.match(/^-?[1-9][0-9]*$/)) {
-    throw new Error(__('Claim sequence must be a number.'));
-  }
-
-  if (bidPosition && !bidPosition.match(/^-?[1-9][0-9]*$/)) {
-    throw new Error(__('Bid position must be a number.'));
-  }
-
-  // Validate and process path
-  if (path) {
-    if (!isChannel) {
-      throw new Error(__('Only channel URIs may have a path.'));
-    }
-
-    const pathBadChars = path.match(regexInvalidURI);
-    if (pathBadChars) {
-      throw new Error(__(`Invalid character in path: %s`, pathBadChars.join(', ')));
-    }
-
-    contentName = path;
-  } else if (pathSep) {
-    throw new Error(__('No path provided after /'));
-  }
-
-  return {
-    claimName,
-    path,
-    isChannel,
-    ...(contentName ? { contentName } : {}),
-    ...(channelName ? { channelName } : {}),
-    ...(claimSequence ? { claimSequence: parseInt(claimSequence, 10) } : {}),
-    ...(bidPosition ? { bidPosition: parseInt(bidPosition, 10) } : {}),
-    ...(claimId ? { claimId } : {}),
-    ...(path ? { path } : {}),
-  };
-}
-
-/**
- * Takes an object in the same format returned by parse() and builds a URI.
- *
- * The channelName key will accept names with or without the @ prefix.
- */
-export function buildURI(URIObj, includeProto = true) {
-  const { claimId, claimSequence, bidPosition, contentName, channelName } = URIObj;
-
-  let { claimName, path } = URIObj;
-
-  if (channelName) {
-    const channelNameFormatted = channelName.startsWith('@') ? channelName : `@${channelName}`;
-    if (!claimName) {
-      claimName = channelNameFormatted;
-    } else if (claimName !== channelNameFormatted) {
-      throw new Error(
-        __(
-          'Received a channel content URI, but claim name and channelName do not match. "name" represents the value in the name position of the URI (lbry://name...), which for channel content will be the channel name. In most cases, to construct a channel URI you should just pass channelName and contentName.'
-        )
-      );
-    }
-  }
-
-  if (contentName) {
-    if (!claimName) {
-      claimName = contentName;
-    } else if (!path) {
-      path = contentName;
-    }
-    if (path && path !== contentName) {
-      throw new Error(
-        __(
-          'Path and contentName do not match. Only one is required; most likely you wanted contentName.'
-        )
-      );
-    }
-  }
-
-  return (
-    (includeProto ? 'lbry://' : '') +
-    claimName +
-    (claimId ? `#${claimId}` : '') +
-    (claimSequence ? `:${claimSequence}` : '') +
-    (bidPosition ? `${bidPosition}` : '') +
-    (path ? `/${path}` : '')
-  );
-}
-
-/* Takes a parseable LBRY URI and converts it to standard, canonical format */
-export function normalizeURI(URI) {
-  if (URI.match(/pending_claim/)) return URI;
-
-  const { claimName, path, bidPosition, claimSequence, claimId } = parseURI(URI);
-  return buildURI({ claimName, path, claimSequence, bidPosition, claimId });
-}
-
-export function isURIValid(URI) {
-  let parts;
-  try {
-    parts = parseURI(normalizeURI(URI));
-  } catch (error) {
-    return false;
-  }
-  return parts && parts.claimName;
-}
-
-export function isNameValid(claimName, checkCase = true) {
-  const regexp = new RegExp('^[a-z0-9-]+$', checkCase ? '' : 'i');
-  return regexp.test(claimName);
-}
-
-export function isURIClaimable(URI) {
-  let parts;
-  try {
-    parts = parseURI(normalizeURI(URI));
-  } catch (error) {
-    return false;
-  }
-  return (
-    parts &&
-    parts.claimName &&
-    !parts.claimId &&
-    !parts.bidPosition &&
-    !parts.claimSequence &&
-    !parts.isChannel &&
-    !parts.path
-  );
-}
diff --git a/src/renderer/lbryio.js b/src/renderer/lbryio.js
index a666a2b28..a80ab27f1 100644
--- a/src/renderer/lbryio.js
+++ b/src/renderer/lbryio.js
@@ -1,38 +1,16 @@
 import { ipcRenderer } from 'electron';
-import Lbry from 'lbry';
+import { Lbry } from 'lbry-redux';
 import querystring from 'querystring';
 
 const Lbryio = {
   enabled: true,
   authenticationPromise: null,
-  exchangePromise: null,
-  exchangeLastFetched: null,
 };
 
 const CONNECTION_STRING = process.env.LBRY_APP_API_URL
   ? process.env.LBRY_APP_API_URL.replace(/\/*$/, '/') // exactly one slash at the end
   : 'https://api.lbry.io/';
 
-const EXCHANGE_RATE_TIMEOUT = 20 * 60 * 1000;
-
-Lbryio.getExchangeRates = () => {
-  if (
-    !Lbryio.exchangeLastFetched ||
-    Date.now() - Lbryio.exchangeLastFetched > EXCHANGE_RATE_TIMEOUT
-  ) {
-    Lbryio.exchangePromise = new Promise((resolve, reject) => {
-      Lbryio.call('lbc', 'exchange_rate', {}, 'get', true)
-        .then(({ lbc_usd: LBC_USD, lbc_btc: LBC_BTC, btc_usd: BTC_USD }) => {
-          const rates = { LBC_USD, LBC_BTC, BTC_USD };
-          resolve(rates);
-        })
-        .catch(reject);
-    });
-    Lbryio.exchangeLastFetched = Date.now();
-  }
-  return Lbryio.exchangePromise;
-};
-
 Lbryio.call = (resource, action, params = {}, method = 'get') => {
   if (!Lbryio.enabled) {
     console.log(__('Internal API disabled'));
diff --git a/src/renderer/modal/modalAffirmPurchase/index.js b/src/renderer/modal/modalAffirmPurchase/index.js
index f3e5fc161..509cfc53f 100644
--- a/src/renderer/modal/modalAffirmPurchase/index.js
+++ b/src/renderer/modal/modalAffirmPurchase/index.js
@@ -1,8 +1,6 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doCloseModal } from 'redux/actions/app';
 import { doLoadVideo, doSetPlayingUri } from 'redux/actions/content';
-import { makeSelectMetadataForUri } from 'redux/selectors/claims';
+import { doCloseModal, makeSelectMetadataForUri } from 'lbry-redux';
 import ModalAffirmPurchase from './view';
 
 const select = (state, props) => ({
diff --git a/src/renderer/modal/modalAuthFailure/index.js b/src/renderer/modal/modalAuthFailure/index.js
index ed408365f..b947bddfa 100644
--- a/src/renderer/modal/modalAuthFailure/index.js
+++ b/src/renderer/modal/modalAuthFailure/index.js
@@ -1,6 +1,5 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doCloseModal } from 'redux/actions/app';
+import { doCloseModal } from 'lbry-redux';
 import ModalAuthFailure from './view';
 
 const select = state => ({});
diff --git a/src/renderer/modal/modalAutoUpdateDownloaded/view.jsx b/src/renderer/modal/modalAutoUpdateDownloaded/view.jsx
index 0627d7b51..5db639f87 100644
--- a/src/renderer/modal/modalAutoUpdateDownloaded/view.jsx
+++ b/src/renderer/modal/modalAutoUpdateDownloaded/view.jsx
@@ -1,10 +1,8 @@
 import React from 'react';
+import { ipcRenderer } from 'electron';
 import { Modal } from 'modal/modal';
-import { Line } from 'rc-progress';
 import Button from 'component/button';
 
-const { ipcRenderer } = require('electron');
-
 class ModalAutoUpdateDownloaded extends React.PureComponent {
   render() {
     const { closeModal, declineAutoUpdate } = this.props;
@@ -32,6 +30,14 @@ class ModalAutoUpdateDownloaded extends React.PureComponent {
               'A new version of LBRY has been released, downloaded, and is ready for you to use pending a restart.'
             )}
           </p>
+          <p className="meta text-center">
+            {__('Want to know what has changed?')} See the{' '}
+            <Button
+              button="link"
+              label={__('release notes')}
+              href="https://github.com/lbryio/lbry-app/releases"
+            />.
+          </p>
         </section>
       </Modal>
     );
diff --git a/src/renderer/modal/modalCreditIntro/index.js b/src/renderer/modal/modalCreditIntro/index.js
index 247d2ff5d..a8d956403 100644
--- a/src/renderer/modal/modalCreditIntro/index.js
+++ b/src/renderer/modal/modalCreditIntro/index.js
@@ -1,9 +1,8 @@
 import { connect } from 'react-redux';
-import { doCloseModal } from 'redux/actions/app';
 import { doNavigate } from 'redux/actions/navigation';
 import { doSetClientSetting } from 'redux/actions/settings';
 import { selectUserIsRewardApproved } from 'redux/selectors/user';
-import { selectBalance } from 'redux/selectors/wallet';
+import { selectBalance, doCloseModal } from 'lbry-redux';
 import { selectUnclaimedRewardValue } from 'redux/selectors/rewards';
 import * as settings from 'constants/settings';
 import ModalCreditIntro from './view';
diff --git a/src/renderer/modal/modalCreditIntro/view.jsx b/src/renderer/modal/modalCreditIntro/view.jsx
index cd525783b..96e2fb801 100644
--- a/src/renderer/modal/modalCreditIntro/view.jsx
+++ b/src/renderer/modal/modalCreditIntro/view.jsx
@@ -21,24 +21,24 @@ const ModalCreditIntro = props => {
         </p>
         {currentBalance <= 0 && (
           <p>
-            You currently have <CreditAmount amount={currentBalance} />, so the actions you can take
-            are limited.
+            You currently have <CreditAmount noStyle amount={currentBalance} />, so the actions you
+            can take are limited.
           </p>
         )}
         <p>
           There are a variety of ways to get credits, including more than{' '}
           {totalRewardValue ? (
-            <CreditAmount amount={totalRewardRounded} />
+            <CreditAmount noStyle amount={totalRewardRounded} />
           ) : (
             <span className="credit-amount">{__('?? credits')}</span>
           )}{' '}
           {__(' in free rewards for participating in the LBRY beta.')}
         </p>
 
-        <div className="modal__buttons">
+        <div className="card__actions card__actions--center">
           <Button button="primary" onClick={addBalance} label={__('Get Credits')} />
           <Button
-            button="alt"
+            button="link"
             onClick={closeModal}
             label={currentBalance <= 0 ? __('Use Without LBC') : __('Meh, Not Now')}
           />
diff --git a/src/renderer/modal/modalEmailCollection/index.js b/src/renderer/modal/modalEmailCollection/index.js
index 242b9e509..96d98a815 100644
--- a/src/renderer/modal/modalEmailCollection/index.js
+++ b/src/renderer/modal/modalEmailCollection/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import * as settings from 'constants/settings';
 import { connect } from 'react-redux';
 import { doCloseModal } from 'redux/actions/app';
diff --git a/src/renderer/modal/modalError/index.js b/src/renderer/modal/modalError/index.js
index 570827151..baf5f3399 100644
--- a/src/renderer/modal/modalError/index.js
+++ b/src/renderer/modal/modalError/index.js
@@ -1,6 +1,5 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doCloseModal } from 'redux/actions/app';
+import { doCloseModal } from 'lbry-redux';
 import ModalError from './view';
 
 const perform = dispatch => ({
diff --git a/src/renderer/modal/modalError/view.jsx b/src/renderer/modal/modalError/view.jsx
index c42d04c8f..5fbf9ab77 100644
--- a/src/renderer/modal/modalError/view.jsx
+++ b/src/renderer/modal/modalError/view.jsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import lbry from 'lbry';
+import Native from 'native';
 import { ExpandableModal } from 'modal/modal';
 
 class ModalError extends React.PureComponent {
@@ -8,7 +8,7 @@ class ModalError extends React.PureComponent {
 
     const errorObj = typeof error === 'string' ? { message: error } : error;
 
-    const error_key_labels = {
+    const errorKeyLabels = {
       connectionString: __('API connection string'),
       method: __('Method'),
       params: __('Parameters'),
@@ -20,7 +20,7 @@ class ModalError extends React.PureComponent {
     const errorInfoList = [];
     for (const key of Object.keys(errorObj)) {
       const val = typeof errorObj[key] === 'string' ? errorObj[key] : JSON.stringify(errorObj[key]);
-      const label = error_key_labels[key];
+      const label = errorKeyLabels[key];
       errorInfoList.push(
         <li key={key}>
           <strong>{label}</strong>: <code>{val}</code>
@@ -42,7 +42,11 @@ class ModalError extends React.PureComponent {
 
         <div className="error-modal__content">
           <div>
-            <img className="error-modal__warning-symbol" src={lbry.imagePath('warning.png')} />
+            <img
+              alt=""
+              className="error-modal__warning-symbol"
+              src={Native.imagePath('warning.png')}
+            />
           </div>
           <p>
             {__(
diff --git a/src/renderer/modal/modalFileTimeout/index.js b/src/renderer/modal/modalFileTimeout/index.js
index 2d8d280fc..b63d598d3 100644
--- a/src/renderer/modal/modalFileTimeout/index.js
+++ b/src/renderer/modal/modalFileTimeout/index.js
@@ -1,10 +1,8 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doCloseModal } from 'redux/actions/app';
-import { makeSelectMetadataForUri } from 'redux/selectors/claims';
+import { doCloseModal, makeSelectMetadataForUri } from 'lbry-redux';
 import ModalFileTimeout from './view';
 
-const select = state => ({
+const select = (state, props) => ({
   metadata: makeSelectMetadataForUri(props.uri)(state),
 });
 
diff --git a/src/renderer/modal/modalFirstReward/index.js b/src/renderer/modal/modalFirstReward/index.js
index 77d8ac376..0ccf49732 100644
--- a/src/renderer/modal/modalFirstReward/index.js
+++ b/src/renderer/modal/modalFirstReward/index.js
@@ -1,11 +1,10 @@
-import React from 'react';
 import rewards from 'rewards';
 import { connect } from 'react-redux';
-import { doCloseModal } from 'redux/actions/app';
+import { doCloseModal } from 'lbry-redux';
 import { makeSelectRewardByType } from 'redux/selectors/rewards';
 import ModalFirstReward from './view';
 
-const select = (state, props) => {
+const select = state => {
   const selectReward = makeSelectRewardByType();
 
   return {
diff --git a/src/renderer/modal/modalPhoneCollection/index.js b/src/renderer/modal/modalPhoneCollection/index.js
index d3ae17bc6..323d70dc0 100644
--- a/src/renderer/modal/modalPhoneCollection/index.js
+++ b/src/renderer/modal/modalPhoneCollection/index.js
@@ -4,8 +4,8 @@ import { connect } from 'react-redux';
 import { doCloseModal } from 'redux/actions/app';
 import { doSetClientSetting } from 'redux/actions/settings';
 import { selectPhoneToVerify, selectUser } from 'redux/selectors/user';
-import ModalPhoneCollection from './view';
 import { doNavigate } from 'redux/actions/navigation';
+import ModalPhoneCollection from './view';
 
 const select = state => ({
   phone: selectPhoneToVerify(state),
diff --git a/src/renderer/modal/modalPhoneCollection/view.jsx b/src/renderer/modal/modalPhoneCollection/view.jsx
index 123e4e4df..ccfd1f694 100644
--- a/src/renderer/modal/modalPhoneCollection/view.jsx
+++ b/src/renderer/modal/modalPhoneCollection/view.jsx
@@ -8,7 +8,7 @@ class ModalPhoneCollection extends React.PureComponent {
   renderInner() {
     const { closeModal, phone, user } = this.props;
 
-    const cancelButton = <Button button="text" onClick={closeModal} label={__('Not Now')} />;
+    const cancelButton = <Button button="link" onClick={closeModal} label={__('Not Now')} />;
 
     if (!user.phone_number && !phone) {
       return <UserPhoneNew cancelButton={cancelButton} />;
diff --git a/src/renderer/modal/modalRemoveFile/index.js b/src/renderer/modal/modalRemoveFile/index.js
index 76fac9580..d83fe60e0 100644
--- a/src/renderer/modal/modalRemoveFile/index.js
+++ b/src/renderer/modal/modalRemoveFile/index.js
@@ -1,9 +1,11 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doCloseModal } from 'redux/actions/app';
-import { doDeleteFileAndGoBack } from 'redux/actions/file_info';
-import { makeSelectTitleForUri, makeSelectClaimIsMine } from 'redux/selectors/claims';
-import { makeSelectFileInfoForUri } from 'redux/selectors/file_info';
+import { doDeleteFileAndGoBack } from 'redux/actions/file';
+import {
+  doCloseModal,
+  makeSelectTitleForUri,
+  makeSelectClaimIsMine,
+  makeSelectFileInfoForUri,
+} from 'lbry-redux';
 import ModalRemoveFile from './view';
 
 const select = (state, props) => ({
diff --git a/src/renderer/modal/modalRevokeClaim/index.js b/src/renderer/modal/modalRevokeClaim/index.js
index 7a47859f4..bd7d3e1cd 100644
--- a/src/renderer/modal/modalRevokeClaim/index.js
+++ b/src/renderer/modal/modalRevokeClaim/index.js
@@ -1,8 +1,5 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doCloseModal } from 'redux/actions/app';
-import { doAbandonClaim } from 'redux/actions/content';
-import { selectTransactionItems } from 'redux/selectors/wallet';
+import { doCloseModal, doAbandonClaim, selectTransactionItems } from 'lbry-redux';
 import ModalRevokeClaim from './view';
 
 const select = state => ({
diff --git a/src/renderer/modal/modalRewardApprovalRequired/index.js b/src/renderer/modal/modalRewardApprovalRequired/index.js
index 21091f5d8..613b09497 100644
--- a/src/renderer/modal/modalRewardApprovalRequired/index.js
+++ b/src/renderer/modal/modalRewardApprovalRequired/index.js
@@ -1,6 +1,5 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doCloseModal } from 'redux/actions/app';
+import { doCloseModal } from 'lbry-redux';
 import { doAuthNavigate } from 'redux/actions/navigation';
 import ModalRewardApprovalRequired from './view';
 
diff --git a/src/renderer/modal/modalRouter/index.js b/src/renderer/modal/modalRouter/index.js
index cea033096..d2e5fb0f8 100644
--- a/src/renderer/modal/modalRouter/index.js
+++ b/src/renderer/modal/modalRouter/index.js
@@ -1,17 +1,14 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doOpenModal } from 'redux/actions/app';
 import * as settings from 'constants/settings';
 import { selectCurrentModal, selectModalProps, selectModalsAllowed } from 'redux/selectors/app';
-import { selectCurrentPage } from 'redux/selectors/navigation';
-import { selectCostForCurrentPageUri } from 'redux/selectors/cost_info';
+import { doOpenModal } from 'redux/actions/app';
+import { selectCostForCurrentPageUri, selectBalance, selectCurrentPage } from 'lbry-redux';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
 import { selectUser, selectUserIsVerificationCandidate } from 'redux/selectors/user';
-import { selectBalance } from 'redux/selectors/wallet';
 
 import ModalRouter from './view';
 
-const select = (state, props) => ({
+const select = state => ({
   balance: selectBalance(state),
   showPageCost: selectCostForCurrentPageUri(state),
   modal: selectCurrentModal(state),
diff --git a/src/renderer/modal/modalTransactionFailed/index.js b/src/renderer/modal/modalTransactionFailed/index.js
index 7809b05ee..c01c8e56e 100644
--- a/src/renderer/modal/modalTransactionFailed/index.js
+++ b/src/renderer/modal/modalTransactionFailed/index.js
@@ -1,6 +1,5 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doCloseModal } from 'redux/actions/app';
+import { doCloseModal } from 'lbry-redux';
 import ModalTransactionFailed from './view';
 
 const select = state => ({});
diff --git a/src/renderer/modal/modalWelcome/index.js b/src/renderer/modal/modalWelcome/index.js
index 0688d6a07..f6a33fa0f 100644
--- a/src/renderer/modal/modalWelcome/index.js
+++ b/src/renderer/modal/modalWelcome/index.js
@@ -1,8 +1,6 @@
-import React from 'react';
 import * as settings from 'constants/settings';
-import * as modals from 'constants/modal_types';
 import { connect } from 'react-redux';
-import { doCloseModal, doOpenModal } from 'redux/actions/app';
+import { doCloseModal } from 'lbry-redux';
 import { doSetClientSetting } from 'redux/actions/settings';
 import ModalWelcome from './view';
 
diff --git a/src/renderer/native.js b/src/renderer/native.js
new file mode 100644
index 000000000..4b6dbf3e3
--- /dev/null
+++ b/src/renderer/native.js
@@ -0,0 +1,15 @@
+import { ipcRenderer } from 'electron';
+
+const Native = {};
+
+Native.getAppVersionInfo = () =>
+  new Promise(resolve => {
+    ipcRenderer.once('version-info-received', (event, versionInfo) => {
+      resolve(versionInfo);
+    });
+    ipcRenderer.send('version-info-requested');
+  });
+
+Native.imagePath = file => `${staticResourcesPath}/img/${file}`;
+
+export default Native;
diff --git a/src/renderer/page/auth/index.js b/src/renderer/page/auth/index.js
index 63d9b15f7..7964ef405 100644
--- a/src/renderer/page/auth/index.js
+++ b/src/renderer/page/auth/index.js
@@ -1,7 +1,6 @@
-import React from 'react';
-import { doNavigate } from 'redux/actions/navigation';
+import { selectPathAfterAuth } from 'lbry-redux';
 import { connect } from 'react-redux';
-import { selectPathAfterAuth } from 'redux/selectors/navigation';
+import { doNavigate } from 'redux/actions/navigation';
 import {
   selectAuthenticationIsPending,
   selectEmailToVerify,
diff --git a/src/renderer/page/channel/index.js b/src/renderer/page/channel/index.js
index 38fabedfe..5cf33426b 100644
--- a/src/renderer/page/channel/index.js
+++ b/src/renderer/page/channel/index.js
@@ -1,12 +1,12 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { doFetchClaimsByChannel, doFetchClaimCountByChannel } from 'redux/actions/content';
 import {
   makeSelectClaimForUri,
   makeSelectClaimsInChannelForCurrentPage,
   makeSelectFetchingChannelClaims,
-} from 'redux/selectors/claims';
-import { makeSelectCurrentParam, selectCurrentParams } from 'redux/selectors/navigation';
+  makeSelectCurrentParam,
+  selectCurrentParams,
+} from 'lbry-redux';
 import { doNavigate } from 'redux/actions/navigation';
 import { makeSelectTotalPagesForChannel } from 'redux/selectors/content';
 import { doOpenModal } from 'redux/actions/app';
diff --git a/src/renderer/page/file/index.js b/src/renderer/page/file/index.js
index 08e25e314..b8bd7c471 100644
--- a/src/renderer/page/file/index.js
+++ b/src/renderer/page/file/index.js
@@ -1,24 +1,23 @@
 import { connect } from 'react-redux';
 import { doNavigate } from 'redux/actions/navigation';
-import { doFetchFileInfo } from 'redux/actions/file_info';
-import { makeSelectFileInfoForUri } from 'redux/selectors/file_info';
 import { selectRewardContentClaimIds, selectPlayingUri } from 'redux/selectors/content';
-import { doFetchCostInfoForUri } from 'redux/actions/cost_info';
 import { doCheckSubscription } from 'redux/actions/subscriptions';
 import {
+  doFetchFileInfo,
+  doFetchCostInfoForUri,
+  makeSelectClaimIsMine,
+  makeSelectCostInfoForUri,
+  makeSelectFileInfoForUri,
   makeSelectClaimForUri,
   makeSelectContentTypeForUri,
   makeSelectMetadataForUri,
-  makeSelectClaimIsMine,
-} from 'redux/selectors/claims';
-import { makeSelectCostInfoForUri } from 'redux/selectors/cost_info';
+} from 'lbry-redux';
 import { selectShowNsfw } from 'redux/selectors/settings';
+import { selectSubscriptions } from 'redux/selectors/subscriptions';
 import { selectMediaPaused } from 'redux/selectors/media';
 import { doOpenModal } from 'redux/actions/app';
-import FilePage from './view';
-import { makeSelectCurrentParam } from 'redux/selectors/navigation';
-import { selectSubscriptions } from 'redux/selectors/subscriptions';
 import { doPrepareEdit } from 'redux/actions/publish';
+import FilePage from './view';
 
 const select = (state, props) => ({
   claim: makeSelectClaimForUri(props.uri)(state),
@@ -40,7 +39,7 @@ const perform = dispatch => ({
   fetchCostInfo: uri => dispatch(doFetchCostInfoForUri(uri)),
   checkSubscription: subscription => dispatch(doCheckSubscription(subscription)),
   openModal: (modal, props) => dispatch(doOpenModal(modal, props)),
-  prepareEdit: publishData => dispatch(doPrepareEdit(publishData)),
+  prepareEdit: (publishData, uri) => dispatch(doPrepareEdit(publishData, uri)),
 });
 
 export default connect(select, perform)(FilePage);
diff --git a/src/renderer/page/file/view.jsx b/src/renderer/page/file/view.jsx
index b017ea745..ee9a7f6c8 100644
--- a/src/renderer/page/file/view.jsx
+++ b/src/renderer/page/file/view.jsx
@@ -1,7 +1,6 @@
 // @flow
 import * as React from 'react';
-import lbry from 'lbry';
-import { buildURI, normalizeURI } from 'lbryURI';
+import { Lbry, buildURI, normalizeURI } from 'lbry-redux';
 import Video from 'component/video';
 import Thumbnail from 'component/common/thumbnail';
 import FilePrice from 'component/filePrice';
@@ -9,7 +8,6 @@ import FileDetails from 'component/fileDetails';
 import FileActions from 'component/fileActions';
 import UriIndicator from 'component/uriIndicator';
 import Icon from 'component/common/icon';
-import WalletSendTip from 'component/walletSendTip';
 import DateTime from 'component/dateTime';
 import * as icons from 'constants/icons';
 import Button from 'component/button';
@@ -72,7 +70,7 @@ class FilePage extends React.Component<Props> {
     }
   }
 
-  checkSubscription(props) {
+  checkSubscription = (props: Props) => {
     if (
       props.subscriptions
         .map(subscription => subscription.channelName)
@@ -89,12 +87,11 @@ class FilePage extends React.Component<Props> {
         ),
       });
     }
-  }
+  };
 
   render() {
     const {
       claim,
-      fileInfo,
       metadata,
       contentType,
       uri,
@@ -109,12 +106,11 @@ class FilePage extends React.Component<Props> {
     } = this.props;
 
     // File info
-    const title = metadata.title;
+    const { title, thumbnail } = metadata;
     const isRewardContent = rewardedContentClaimIds.includes(claim.claim_id);
     const shouldObscureThumbnail = obscureNsfw && metadata.nsfw;
-    const thumbnail = metadata.thumbnail;
     const { height, channel_name: channelName, value } = claim;
-    const mediaType = lbry.getMediaType(contentType);
+    const mediaType = Lbry.getMediaType(contentType);
     const isPlayable =
       Object.values(player.mime).indexOf(contentType) !== -1 || mediaType === 'audio';
     const channelClaimId =
@@ -165,7 +161,7 @@ class FilePage extends React.Component<Props> {
                       icon={icons.EDIT}
                       label={__('Edit')}
                       onClick={() => {
-                        prepareEdit(claim);
+                        prepareEdit(claim, uri);
                         navigate('/publish');
                       }}
                     />
diff --git a/src/renderer/page/fileListDownloaded/index.js b/src/renderer/page/fileListDownloaded/index.js
index 9fc0fb685..86482f664 100644
--- a/src/renderer/page/fileListDownloaded/index.js
+++ b/src/renderer/page/fileListDownloaded/index.js
@@ -1,6 +1,5 @@
 import { connect } from 'react-redux';
-import { selectFileInfosDownloaded } from 'redux/selectors/file_info';
-import { selectMyClaimsWithoutChannels } from 'redux/selectors/claims';
+import { selectFileInfosDownloaded, selectMyClaimsWithoutChannels } from 'lbry-redux';
 import { doNavigate } from 'redux/actions/navigation';
 import FileListDownloaded from './view';
 
diff --git a/src/renderer/page/fileListPublished/index.js b/src/renderer/page/fileListPublished/index.js
index 8b7546b73..643b27a6c 100644
--- a/src/renderer/page/fileListPublished/index.js
+++ b/src/renderer/page/fileListPublished/index.js
@@ -1,5 +1,5 @@
 import { connect } from 'react-redux';
-import { selectMyClaimsWithoutChannels } from 'redux/selectors/claims';
+import { selectMyClaimsWithoutChannels } from 'lbry-redux';
 import { selectPendingPublishesLessEdits } from 'redux/selectors/publish';
 import { doNavigate } from 'redux/actions/navigation';
 import { doCheckPendingPublishes } from 'redux/actions/publish';
diff --git a/src/renderer/page/help/index.js b/src/renderer/page/help/index.js
index 7138061ed..6a59becb9 100644
--- a/src/renderer/page/help/index.js
+++ b/src/renderer/page/help/index.js
@@ -1,6 +1,5 @@
-import React from 'react';
-import { doAuthNavigate } from 'redux/actions/navigation';
 import { connect } from 'react-redux';
+import { doAuthNavigate } from 'redux/actions/navigation';
 import { doFetchAccessToken } from 'redux/actions/user';
 import { selectAccessToken, selectUser } from 'redux/selectors/user';
 import HelpPage from './view';
diff --git a/src/renderer/page/help/view.jsx b/src/renderer/page/help/view.jsx
index 27cd7faec..4bfd88963 100644
--- a/src/renderer/page/help/view.jsx
+++ b/src/renderer/page/help/view.jsx
@@ -1,6 +1,7 @@
 // @TODO: Customize advice based on OS
 import React from 'react';
-import lbry from 'lbry.js';
+import { Lbry } from 'lbry-redux';
+import Native from 'native';
 import Button from 'component/button';
 import BusyIndicator from 'component/common/busy-indicator';
 import Icon from 'component/common/icon';
@@ -23,18 +24,18 @@ class HelpPage extends React.PureComponent {
   }
 
   componentDidMount() {
-    lbry.getAppVersionInfo().then(({ remoteVersion, localVersion, upgradeAvailable }) => {
+    Native.getAppVersionInfo().then(({ remoteVersion, localVersion, upgradeAvailable }) => {
       this.setState({
         uiVersion: localVersion,
         upgradeAvailable,
       });
     });
-    lbry.version().then(info => {
+    Lbry.version().then(info => {
       this.setState({
         versionInfo: info,
       });
     });
-    lbry.status({ session_status: true }).then(info => {
+    Lbry.status({ session_status: true }).then(info => {
       this.setState({
         lbryId: info.lbry_id,
       });
@@ -50,18 +51,21 @@ class HelpPage extends React.PureComponent {
   }
 
   render() {
-    let ver, osName, platform, newVerLink;
+    let ver;
+    let osName;
+    let platform;
+    let newVerLink;
 
     const { accessToken, doAuth, user } = this.props;
 
     if (this.state.versionInfo) {
       ver = this.state.versionInfo;
-      if (ver.os_system == 'Darwin') {
-        osName = parseInt(ver.os_release.match(/^\d+/)) < 16 ? 'Mac OS X' : 'Mac OS';
+      if (ver.os_system === 'Darwin') {
+        osName = parseInt(ver.os_release.match(/^\d+/), 10) < 16 ? 'Mac OS X' : 'Mac OS';
 
         platform = `${osName} ${ver.os_release}`;
         newVerLink = 'https://lbry.io/get/lbry.dmg';
-      } else if (ver.os_system == 'Linux') {
+      } else if (ver.os_system === 'Linux') {
         platform = `Linux (${ver.platform})`;
         newVerLink = 'https://lbry.io/get/lbry.deb';
       } else {
@@ -151,10 +155,10 @@ class HelpPage extends React.PureComponent {
                     {user && user.primary_email ? (
                       user.primary_email
                     ) : (
-                      <span>
+                      <React.Fragment>
                         <span className="empty">{__('none')} </span>
-                        (<Button onClick={() => doAuth()} label={__('set email')} />)
-                      </span>
+                        <Button button="link" onClick={() => doAuth()} label={__('set email')} />
+                      </React.Fragment>
                     )}
                   </td>
                 </tr>
diff --git a/src/renderer/page/publish/index.js b/src/renderer/page/publish/index.js
index c73a3d492..864ab0df5 100644
--- a/src/renderer/page/publish/index.js
+++ b/src/renderer/page/publish/index.js
@@ -1,14 +1,25 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doNavigate } from 'redux/actions/navigation';
 import { doClaimRewardType } from 'redux/actions/rewards';
-import { selectMyClaims, selectClaimsByUri } from 'redux/selectors/claims';
-import { selectResolvingUris } from 'redux/selectors/content';
+import {
+  doHistoryBack,
+  doResolveUri,
+  makeSelectCostInfoForUri,
+  selectMyClaims,
+  selectFetchingMyChannels,
+  selectMyChannelClaims,
+  selectClaimsByUri,
+  selectResolvingUris,
+  selectBalance,
+} from 'lbry-redux';
+import {
+  doFetchClaimListMine,
+  doFetchChannelListMine,
+  doCreateChannel,
+} from 'redux/actions/content';
+import { doNavigate } from 'redux/actions/navigation';
+import rewards from 'rewards';
 import { selectPublishFormValues } from 'redux/selectors/publish';
-import { doResolveUri } from 'redux/actions/content';
-import { selectBalance } from 'redux/selectors/wallet';
 import { doClearPublish, doUpdatePublishForm, doPublish } from 'redux/actions/publish';
-import { makeSelectCostInfoForUri } from 'redux/selectors/cost_info';
 import { doPrepareEdit } from 'redux/actions/publish';
 import PublishPage from './view';
 
@@ -50,7 +61,7 @@ const perform = dispatch => ({
   resolveUri: uri => dispatch(doResolveUri(uri)),
   publish: params => dispatch(doPublish(params)),
   navigate: path => dispatch(doNavigate(path)),
-  prepareEdit: claim => dispatch(doPrepareEdit(claim)),
+  prepareEdit: (claim, uri) => dispatch(doPrepareEdit(claim, uri)),
 });
 
 export default connect(select, perform)(PublishPage);
diff --git a/src/renderer/page/report/index.js b/src/renderer/page/report/index.js
new file mode 100644
index 000000000..a43d54529
--- /dev/null
+++ b/src/renderer/page/report/index.js
@@ -0,0 +1,4 @@
+import { connect } from 'react-redux';
+import ReportPage from './view';
+
+export default connect(null, null)(ReportPage);
diff --git a/src/renderer/page/report.js b/src/renderer/page/report/view.jsx
similarity index 75%
rename from src/renderer/page/report.js
rename to src/renderer/page/report/view.jsx
index 1c8eea4b2..37b651603 100644
--- a/src/renderer/page/report.js
+++ b/src/renderer/page/report/view.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import Button from 'component/button';
 import { FormRow } from 'component/common/form';
+import { Lbry } from 'lbry-redux';
 import { doShowSnackBar } from 'redux/actions/app';
-import lbry from '../lbry.js';
 
 class ReportPage extends React.Component {
   constructor(props) {
@@ -14,13 +14,19 @@ class ReportPage extends React.Component {
     };
   }
 
+  onMessageChange(event) {
+    this.setState({
+      message: event.target.value,
+    });
+  }
+
   submitMessage() {
-    const message = this.state.message;
+    const { message } = this.state;
     if (message) {
       this.setState({
         submitting: true,
       });
-      lbry.report_bug({ message }).then(() => {
+      Lbry.report_bug({ message }).then(() => {
         this.setState({
           submitting: false,
         });
@@ -37,58 +43,55 @@ class ReportPage extends React.Component {
     }
   }
 
-  onMessageChange(event) {
-    this.setState({
-      message: event.target.value,
-    });
-  }
-
   render() {
     return (
-      <main className="main--single-column">
-        <section className="card">
+      <Page>
+        <section className="card card--section">
           <div className="card__content">
-            <h3>{__('Report an Issue')}</h3>
+            <div className="card__title">{__('Report an Issue')}</div>
             <p>
               {__(
                 'Please describe the problem you experienced and any information you think might be useful to us. Links to screenshots are great!'
               )}
             </p>
-            <div className="form-row">
-              <FormRow
+            <FormRow>
+              <FormField
                 type="textarea"
                 rows="10"
                 name="message"
+                stretch
                 value={this.state.message}
                 onChange={event => {
                   this.onMessageChange(event);
                 }}
                 placeholder={__('Description of your issue')}
               />
-            </div>
-            <div className="form-row form-row-submit">
-              <button
+            </FormRow>
+            <div className="card__actions">
+              <Button
+                button="primary"
                 onClick={event => {
                   this.submitMessage(event);
                 }}
                 className={`button-block button-primary ${this.state.submitting ? 'disabled' : ''}`}
               >
                 {this.state.submitting ? __('Submitting...') : __('Submit Report')}
-              </button>
+              </Button>
             </div>
           </div>
         </section>
-        <section className="card">
-          <div className="card__content">
-            <h3>{__('Developer?')}</h3>
+        <section className="card card--section">
+          <div className="card__title">{__('Developer?')}</div>
+          <p>
             {__('You can also')}{' '}
             <Button
+              button="link"
               href="https://github.com/lbryio/lbry/issues"
               label={__('submit an issue on GitHub')}
             />.
-          </div>
+          </p>
         </section>
-      </main>
+      </Page>
     );
   }
 }
diff --git a/src/renderer/page/rewards/index.js b/src/renderer/page/rewards/index.js
index c0c7c6b64..8efdfe1d3 100644
--- a/src/renderer/page/rewards/index.js
+++ b/src/renderer/page/rewards/index.js
@@ -1,4 +1,3 @@
-import React from 'react';
 import { connect } from 'react-redux';
 import { selectFetchingRewards, selectUnclaimedRewards } from 'redux/selectors/rewards';
 import { selectUser } from 'redux/selectors/user';
diff --git a/src/renderer/page/rewards/view.jsx b/src/renderer/page/rewards/view.jsx
index f79e806e8..ded3f37fc 100644
--- a/src/renderer/page/rewards/view.jsx
+++ b/src/renderer/page/rewards/view.jsx
@@ -1,3 +1,4 @@
+// @flow
 import React from 'react';
 import BusyIndicator from 'component/common/busy-indicator';
 import RewardListClaimed from 'component/rewardListClaimed';
@@ -6,7 +7,20 @@ import Button from 'component/button';
 import Page from 'component/page';
 import classnames from 'classnames';
 
-class RewardsPage extends React.PureComponent {
+type Props = {
+  doAuth: () => void,
+  navigate: string => void,
+  fetching: boolean,
+  rewards: Array<{ reward_type: boolean }>,
+  user: ?{
+    is_identity_verified: boolean,
+  },
+  daemonSettings: {
+    share_usage_data: boolean,
+  },
+};
+
+class RewardsPage extends React.PureComponent<Props> {
   /*
     Below is broken for users who have claimed all rewards.
 
@@ -74,6 +88,8 @@ class RewardsPage extends React.PureComponent {
         </div>
       );
     }
+
+    return null;
   }
 
   renderUnclaimedRewards() {
@@ -115,7 +131,8 @@ class RewardsPage extends React.PureComponent {
     }
 
     const isNotEligible =
-      !user.primary_email || !user.has_verified_email || !user.is_identity_verified;
+      !user || !user.primary_email || !user.has_verified_email || !user.is_identity_verified;
+
     return (
       <div
         className={classnames('card__list--rewards', {
diff --git a/src/renderer/page/search/index.js b/src/renderer/page/search/index.js
index 7946f5378..75d1f6b00 100644
--- a/src/renderer/page/search/index.js
+++ b/src/renderer/page/search/index.js
@@ -1,8 +1,7 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { selectIsSearching, selectSearchValue } from 'redux/selectors/search';
+import { selectIsSearching, selectSearchValue, doUpdateSearchQuery } from 'lbry-redux';
 import { doNavigate } from 'redux/actions/navigation';
-import { doUpdateSearchQuery } from 'redux/actions/search';
 import SearchPage from './view';
 
 const select = state => ({
diff --git a/src/renderer/page/search/view.jsx b/src/renderer/page/search/view.jsx
index 48273e7a4..03c6a55a7 100644
--- a/src/renderer/page/search/view.jsx
+++ b/src/renderer/page/search/view.jsx
@@ -1,6 +1,6 @@
 // @flow
 import * as React from 'react';
-import { isURIValid, normalizeURI } from 'lbryURI';
+import { isURIValid, normalizeURI } from 'lbry-redux';
 import FileTile from 'component/fileTile';
 import FileListSearch from 'component/fileListSearch';
 import ToolTip from 'component/common/tooltip';
diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx
index 79b6b6ad7..66bd0d9b5 100644
--- a/src/renderer/page/settings/view.jsx
+++ b/src/renderer/page/settings/view.jsx
@@ -274,31 +274,29 @@ class SettingsPage extends React.PureComponent<Props, State> {
               </div>
             </section>
             {
-              // Hiding this for now until we update the dark mode styles
-              // <section className="card card--section">
-              //   <div className="card__title">{__('Theme')}</div>
-              //     <FormField
-              //       name="theme_select"
-              //       type="select"
-              //       onChange={this.onThemeChange}
-              //       value={currentTheme}
-              //       disabled={automaticDarkModeEnabled}
-              //       >
-              //       {themes.map(theme => (
-              //         <option key={theme} value={theme}>
-              //           {theme}
-              //         </option>
-              //       ))}
-              //     </FormField>
-              //
-              //     <FormField
-              //       type="checkbox"
-              //       name="automatic_dark_mode"
-              //       onChange={e => this.onAutomaticDarkModeChange(e.target.checked)}
-              //       checked={automaticDarkModeEnabled}
-              //       postfix={__('Automatic dark mode (9pm to 8am)')}
-              //     />
-              // </section>
+              <section className="card card--section">
+                <div className="card__title">{__('Theme')}</div>
+                <FormField
+                  name="theme_select"
+                  type="select"
+                  onChange={this.onThemeChange}
+                  value={currentTheme}
+                  disabled={automaticDarkModeEnabled}
+                >
+                  {themes.map(theme => (
+                    <option key={theme} value={theme}>
+                      {theme}
+                    </option>
+                  ))}
+                </FormField>
+                <FormField
+                  type="checkbox"
+                  name="automatic_dark_mode"
+                  onChange={e => this.onAutomaticDarkModeChange(e.target.checked)}
+                  checked={automaticDarkModeEnabled}
+                  postfix={__('Automatic dark mode (9pm to 8am)')}
+                />
+              </section>
             }
             <section className="card card--section">
               <div className="card__title">{__('Application Cache')}</div>
diff --git a/src/renderer/page/show/index.js b/src/renderer/page/show/index.js
index 8a3871668..cdb0c981c 100644
--- a/src/renderer/page/show/index.js
+++ b/src/renderer/page/show/index.js
@@ -1,8 +1,5 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doResolveUri } from 'redux/actions/content';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
-import { makeSelectIsUriResolving } from 'redux/selectors/content';
+import { doResolveUri, makeSelectClaimForUri, makeSelectIsUriResolving } from 'lbry-redux';
 import ShowPage from './view';
 
 const select = (state, props) => ({
diff --git a/src/renderer/page/transactionHistory/index.js b/src/renderer/page/transactionHistory/index.js
index 2323994f1..b31414474 100644
--- a/src/renderer/page/transactionHistory/index.js
+++ b/src/renderer/page/transactionHistory/index.js
@@ -1,7 +1,9 @@
-import React from 'react';
 import { connect } from 'react-redux';
-import { doFetchTransactions } from 'redux/actions/wallet';
-import { selectTransactionItems, selectIsFetchingTransactions } from 'redux/selectors/wallet';
+import {
+  doFetchTransactions,
+  selectTransactionItems,
+  selectIsFetchingTransactions,
+} from 'lbry-redux';
 import TransactionHistoryPage from './view';
 
 const select = state => ({
diff --git a/src/renderer/redux/actions/app.js b/src/renderer/redux/actions/app.js
index f9c868baf..41c8b3b52 100644
--- a/src/renderer/redux/actions/app.js
+++ b/src/renderer/redux/actions/app.js
@@ -1,19 +1,16 @@
 import { execSync } from 'child_process';
 import isDev from 'electron-is-dev';
-import Lbry from 'lbry';
 import path from 'path';
-import * as ACTIONS from 'constants/action_types';
 import * as MODALS from 'constants/modal_types';
 import { ipcRenderer, remote } from 'electron';
+import { ACTIONS, Lbry, doBalanceSubscribe, doFetchFileInfosAndPublishedClaims } from 'lbry-redux';
+import Native from 'native';
 import { doFetchRewardedContent } from 'redux/actions/content';
-import { doFetchFileInfosAndPublishedClaims } from 'redux/actions/file_info';
-import { doAuthNavigate } from 'redux/actions/navigation';
 import { doFetchDaemonSettings } from 'redux/actions/settings';
+import { doAuthNavigate } from 'redux/actions/navigation';
 import { doAuthenticate } from 'redux/actions/user';
-import { doBalanceSubscribe } from 'redux/actions/wallet';
 import { doPause } from 'redux/actions/media';
 import { doCheckSubscriptions } from 'redux/actions/subscriptions';
-
 import {
   selectCurrentModal,
   selectIsUpgradeSkipped,
@@ -240,7 +237,7 @@ export function doCheckUpgradeAvailable() {
       });
     };
 
-    Lbry.getAppVersionInfo().then(success, fail);
+    Native.getAppVersionInfo().then(success, fail);
   };
 }
 
@@ -303,13 +300,6 @@ export function doDaemonReady() {
   };
 }
 
-export function doShowSnackBar(data) {
-  return {
-    type: ACTIONS.SHOW_SNACKBAR,
-    data,
-  };
-}
-
 export function doRemoveSnackBarSnack() {
   return {
     type: ACTIONS.REMOVE_SNACKBAR_SNACK,
diff --git a/src/renderer/redux/actions/content.js b/src/renderer/redux/actions/content.js
index afa1ad2ef..d47844598 100644
--- a/src/renderer/redux/actions/content.js
+++ b/src/renderer/redux/actions/content.js
@@ -1,11 +1,7 @@
-import * as ACTIONS from 'constants/action_types';
 import * as MODALS from 'constants/modal_types';
-import * as SETTINGS from 'constants/settings';
 import * as NOTIFICATION_TYPES from 'constants/notification_types';
 import { ipcRenderer } from 'electron';
-import Lbry from 'lbry';
 import Lbryio from 'lbryio';
-import { normalizeURI, buildURI } from 'lbryURI';
 import { doAlertError, doOpenModal } from 'redux/actions/app';
 import { doClaimEligiblePurchaseRewards } from 'redux/actions/rewards';
 import { doNavigate } from 'redux/actions/navigation';
@@ -16,68 +12,28 @@ import {
 } from 'redux/actions/subscriptions';
 import { selectNotifications } from 'redux/selectors/subscriptions';
 import { selectBadgeNumber } from 'redux/selectors/app';
-import { selectMyClaimsRaw } from 'redux/selectors/claims';
-import { selectResolvingUris } from 'redux/selectors/content';
-import { makeSelectCostInfoForUri } from 'redux/selectors/cost_info';
 import {
+  ACTIONS,
+  SETTINGS,
+  Lbry,
+  Lbryapi,
+  buildURI,
+  batchActions,
+  doResolveUris,
+  doFetchClaimListMine,
+  makeSelectCostInfoForUri,
   makeSelectFileInfoForUri,
   selectDownloadingByOutpoint,
   selectTotalDownloadProgress,
-} from 'redux/selectors/file_info';
+  selectBalance,
+} from 'lbry-redux';
 import { makeSelectClientSetting } from 'redux/selectors/settings';
-import { selectBalance } from 'redux/selectors/wallet';
-import batchActions from 'util/batchActions';
 import setBadge from 'util/setBadge';
 import setProgressBar from 'util/setProgressBar';
 import analytics from 'analytics';
 
 const DOWNLOAD_POLL_INTERVAL = 250;
 
-export function doResolveUris(uris) {
-  return (dispatch, getState) => {
-    const normalizedUris = uris.map(normalizeURI);
-    const state = getState();
-
-    // Filter out URIs that are already resolving
-    const resolvingUris = selectResolvingUris(state);
-    const urisToResolve = normalizedUris.filter(uri => !resolvingUris.includes(uri));
-
-    if (urisToResolve.length === 0) {
-      return;
-    }
-
-    dispatch({
-      type: ACTIONS.RESOLVE_URIS_STARTED,
-      data: { uris: normalizedUris },
-    });
-
-    const resolveInfo = {};
-    Lbry.resolve({ uris: urisToResolve }).then(result => {
-      Object.entries(result).forEach(([uri, uriResolveInfo]) => {
-        const fallbackResolveInfo = {
-          claim: null,
-          claimsInChannel: null,
-          certificate: null,
-        };
-
-        const { claim, certificate, claims_in_channel: claimsInChannel } =
-          uriResolveInfo && !uriResolveInfo.error ? uriResolveInfo : fallbackResolveInfo;
-
-        resolveInfo[uri] = { claim, certificate, claimsInChannel };
-      });
-
-      dispatch({
-        type: ACTIONS.RESOLVE_URIS_COMPLETED,
-        data: { resolveInfo },
-      });
-    });
-  };
-}
-
-export function doResolveUri(uri) {
-  return doResolveUris([uri]);
-}
-
 export function doFetchFeaturedUris() {
   return dispatch => {
     dispatch({
@@ -374,7 +330,7 @@ export function doPurchaseUri(uri, specificCostInfo) {
         attemptPlay(cost, instantPurchaseMax.amount);
       } else {
         // Need to convert currency of instant purchase maximum before trying to play
-        Lbryio.getExchangeRates().then(({ LBC_USD }) => {
+        Lbryapi.getExchangeRates().then(({ LBC_USD }) => {
           attemptPlay(cost, instantPurchaseMax.amount / LBC_USD);
         });
       }
@@ -457,23 +413,6 @@ export function doFetchClaimCountByChannel(uri) {
   };
 }
 
-export function doFetchClaimListMine() {
-  return dispatch => {
-    dispatch({
-      type: ACTIONS.FETCH_CLAIM_LIST_MINE_STARTED,
-    });
-
-    Lbry.claim_list_mine().then(claims => {
-      dispatch({
-        type: ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED,
-        data: {
-          claims,
-        },
-      });
-    });
-  };
-}
-
 export function doPlayUri(uri) {
   return dispatch => {
     dispatch(doSetPlayingUri(uri));
@@ -526,43 +465,20 @@ export function doCreateChannel(name, amount) {
   };
 }
 
-export function doAbandonClaim(txid, nout) {
-  return (dispatch, getState) => {
-    const state = getState();
-    const myClaims = selectMyClaimsRaw(state);
-    const { claim_id: claimId, name } = myClaims.find(
-      claim => claim.txid === txid && claim.nout === nout
-    );
+export function doPublish(params) {
+  return dispatch =>
+    new Promise((resolve, reject) => {
+      const success = claim => {
+        resolve(claim);
 
-    dispatch({
-      type: ACTIONS.ABANDON_CLAIM_STARTED,
-      data: {
-        claimId,
-      },
+        if (claim === true) dispatch(doFetchClaimListMine());
+        else
+          setTimeout(() => dispatch(doFetchClaimListMine()), 20000, {
+            once: true,
+          });
+      };
+      const failure = err => reject(err);
+
+      Lbry.publishDeprecated(params, null, success, failure);
     });
-
-    const errorCallback = () => {
-      dispatch(doOpenModal(MODALS.TRANSACTION_FAILED));
-    };
-
-    const successCallback = results => {
-      if (results.txid) {
-        dispatch({
-          type: ACTIONS.ABANDON_CLAIM_SUCCEEDED,
-          data: {
-            claimId,
-          },
-        });
-        dispatch(doResolveUri(buildURI({ claimName: name, claimId })));
-        dispatch(doFetchClaimListMine());
-      } else {
-        dispatch(doOpenModal(MODALS.TRANSACTION_FAILED));
-      }
-    };
-
-    Lbry.claim_abandon({
-      txid,
-      nout,
-    }).then(successCallback, errorCallback);
-  };
 }
diff --git a/src/renderer/redux/actions/cost_info.js b/src/renderer/redux/actions/cost_info.js
deleted file mode 100644
index 7e9966f05..000000000
--- a/src/renderer/redux/actions/cost_info.js
+++ /dev/null
@@ -1,38 +0,0 @@
-import * as ACTIONS from 'constants/action_types';
-import Lbryio from 'lbryio';
-import { selectClaimsByUri } from 'redux/selectors/claims';
-
-// eslint-disable-next-line import/prefer-default-export
-export function doFetchCostInfoForUri(uri) {
-  return (dispatch, getState) => {
-    const state = getState();
-    const claim = selectClaimsByUri(state)[uri];
-
-    if (!claim) return;
-
-    function resolve(costInfo) {
-      dispatch({
-        type: ACTIONS.FETCH_COST_INFO_COMPLETED,
-        data: {
-          uri,
-          costInfo,
-        },
-      });
-    }
-
-    const fee =
-      claim.value && claim.value.stream && claim.value.stream.metadata
-        ? claim.value.stream.metadata.fee
-        : undefined;
-
-    if (fee === undefined) {
-      resolve({ cost: 0, includesData: true });
-    } else if (fee.currency === 'LBC') {
-      resolve({ cost: fee.amount, includesData: true });
-    } else {
-      Lbryio.getExchangeRates().then(({ LBC_USD }) => {
-        resolve({ cost: fee.amount / LBC_USD, includesData: true });
-      });
-    }
-  };
-}
diff --git a/src/renderer/redux/actions/file_info.js b/src/renderer/redux/actions/file.js
similarity index 50%
rename from src/renderer/redux/actions/file_info.js
rename to src/renderer/redux/actions/file.js
index 9ed4c9a6f..303de9b30 100644
--- a/src/renderer/redux/actions/file_info.js
+++ b/src/renderer/redux/actions/file.js
@@ -1,73 +1,17 @@
 import * as ACTIONS from 'constants/action_types';
 import { shell } from 'electron';
-import Lbry from 'lbry';
-import { doCloseModal } from 'redux/actions/app';
-import { doAbandonClaim, doFetchClaimListMine } from 'redux/actions/content';
-import { doHistoryBack } from 'redux/actions/navigation';
 import {
-  selectClaimsByUri,
-  selectIsFetchingClaimListMine,
+  Lbry,
+  batchActions,
+  doAbandonClaim,
   selectMyClaimsOutpoints,
-} from 'redux/selectors/claims';
-import {
   selectFileInfosByOutpoint,
-  selectIsFetchingFileList,
   selectTotalDownloadProgress,
-  selectUrisLoading,
-} from 'redux/selectors/file_info';
-import batchActions from 'util/batchActions';
+} from 'lbry-redux';
+import { doCloseModal } from 'redux/actions/app';
+import { doHistoryBack } from 'redux/actions/navigation';
 import setProgressBar from 'util/setProgressBar';
 
-export function doFetchFileInfo(uri) {
-  return (dispatch, getState) => {
-    const state = getState();
-    const claim = selectClaimsByUri(state)[uri];
-    const outpoint = claim ? `${claim.txid}:${claim.nout}` : null;
-    const alreadyFetching = !!selectUrisLoading(state)[uri];
-
-    if (!alreadyFetching) {
-      dispatch({
-        type: ACTIONS.FETCH_FILE_INFO_STARTED,
-        data: {
-          outpoint,
-        },
-      });
-
-      Lbry.file_list({ outpoint, full_status: true }).then(fileInfos => {
-        dispatch({
-          type: ACTIONS.FETCH_FILE_INFO_COMPLETED,
-          data: {
-            outpoint,
-            fileInfo: fileInfos && fileInfos.length ? fileInfos[0] : null,
-          },
-        });
-      });
-    }
-  };
-}
-
-export function doFileList() {
-  return (dispatch, getState) => {
-    const state = getState();
-    const isFetching = selectIsFetchingFileList(state);
-
-    if (!isFetching) {
-      dispatch({
-        type: ACTIONS.FILE_LIST_STARTED,
-      });
-
-      Lbry.file_list().then(fileInfos => {
-        dispatch({
-          type: ACTIONS.FILE_LIST_SUCCEEDED,
-          data: {
-            fileInfos,
-          },
-        });
-      });
-    }
-  };
-}
-
 export function doOpenFileInFolder(path) {
   return () => {
     shell.showItemInFolder(path);
@@ -127,14 +71,3 @@ export function doDeleteFileAndGoBack(fileInfo, deleteFromComputer, abandonClaim
     dispatch(batchActions(...actions));
   };
 }
-
-export function doFetchFileInfosAndPublishedClaims() {
-  return (dispatch, getState) => {
-    const state = getState();
-    const isFetchingClaimListMine = selectIsFetchingClaimListMine(state);
-    const isFetchingFileInfo = selectIsFetchingFileList(state);
-
-    if (!isFetchingClaimListMine) dispatch(doFetchClaimListMine());
-    if (!isFetchingFileInfo) dispatch(doFileList());
-  };
-}
diff --git a/src/renderer/redux/actions/media.js b/src/renderer/redux/actions/media.js
index f554d054d..1b7d0b85f 100644
--- a/src/renderer/redux/actions/media.js
+++ b/src/renderer/redux/actions/media.js
@@ -1,8 +1,6 @@
 // @flow
 import * as actions from 'constants/action_types';
-import type { Action, Dispatch } from 'redux/reducers/media';
-import lbry from 'lbry';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import type { Dispatch } from 'redux/reducers/media';
 
 export const doPlay = () => (dispatch: Dispatch) =>
   dispatch({
diff --git a/src/renderer/redux/actions/navigation.js b/src/renderer/redux/actions/navigation.js
index 81be11261..dceceea82 100644
--- a/src/renderer/redux/actions/navigation.js
+++ b/src/renderer/redux/actions/navigation.js
@@ -1,5 +1,4 @@
-import * as ACTIONS from 'constants/action_types';
-import { selectHistoryIndex, selectHistoryStack } from 'redux/selectors/navigation';
+import { ACTIONS, selectHistoryIndex, selectHistoryStack } from 'lbry-redux';
 import { toQueryString } from 'util/query_params';
 import analytics from 'analytics';
 
diff --git a/src/renderer/redux/actions/publish.js b/src/renderer/redux/actions/publish.js
index 3bda0253c..9b6d946ce 100644
--- a/src/renderer/redux/actions/publish.js
+++ b/src/renderer/redux/actions/publish.js
@@ -1,8 +1,6 @@
 // @flow
-import Lbry from 'lbry';
-import * as ACTIONS from 'constants/action_types';
 import * as MODALS from 'constants/modal_types';
-import { selectMyClaimsWithoutChannels } from 'redux/selectors/claims';
+import { ACTIONS, Lbry, selectMyClaimsWithoutChannels } from 'lbry-redux';
 import { selectPendingPublishes } from 'redux/selectors/publish';
 import { doOpenModal } from 'redux/actions/app';
 import type {
@@ -15,7 +13,6 @@ import { CHANNEL_NEW, CHANNEL_ANONYMOUS } from 'constants/claim';
 type Action = UpdatePublishFormAction | { type: ACTIONS.CLEAR_PUBLISH };
 type PromiseAction = Promise<Action>;
 type Dispatch = (action: Action | PromiseAction | Array<Action>) => any;
-type ThunkAction = (dispatch: Dispatch) => any;
 type GetState = () => {};
 
 export const doClearPublish = () => (dispatch: Dispatch): Action =>
@@ -29,7 +26,7 @@ export const doUpdatePublishForm = (publishFormValue: UpdatePublishFormData) =>
     data: { ...publishFormValue },
   });
 
-export const doPrepareEdit = (claim: any) => (dispatch: Dispatch) => {
+export const doPrepareEdit = (claim: any, uri: string) => (dispatch: Dispatch) => {
   const { name, amount, channel_name: channelName, value: { stream: { metadata } } } = claim;
   const {
     author,
@@ -63,12 +60,16 @@ export const doPrepareEdit = (claim: any) => (dispatch: Dispatch) => {
     nsfw,
     thumbnail,
     title,
+    uri,
   };
 
   dispatch({ type: ACTIONS.DO_PREPARE_EDIT, data: publishData });
 };
 
-export const doPublish = (params: PublishParams): ThunkAction => {
+export const doPublish = (params: PublishParams) => (dispatch: Dispatch, getState: () => {}) => {
+  const state = getState();
+  const myClaims = selectMyClaimsWithoutChannels(state);
+
   const {
     name,
     bid,
@@ -87,6 +88,17 @@ export const doPublish = (params: PublishParams): ThunkAction => {
     sources,
   } = params;
 
+  let isEdit;
+  const newPublishName = channel ? `${channel}/${name}` : name;
+  for (let i = 0; i < myClaims.length; i += 1) {
+    const { channel_name: claimChannelName, name: claimName } = myClaims[i];
+    const contentName = claimChannelName ? `${claimChannelName}/${claimName}` : claimName;
+    if (contentName === newPublishName) {
+      isEdit = true;
+      break;
+    }
+  }
+
   const channelName = channel === CHANNEL_ANONYMOUS || channel === CHANNEL_NEW ? '' : channel;
   const fee = contentIsFree || !price.amount ? undefined : { ...price };
 
@@ -120,24 +132,22 @@ export const doPublish = (params: PublishParams): ThunkAction => {
     publishPayload.sources = sources;
   }
 
-  return (dispatch: Dispatch) => {
-    dispatch({ type: ACTIONS.PUBLISH_START });
+  dispatch({ type: ACTIONS.PUBLISH_START });
 
-    const success = () => {
-      dispatch({
-        type: ACTIONS.PUBLISH_SUCCESS,
-        data: { pendingPublish: publishPayload },
-      });
-      dispatch(doOpenModal(MODALS.PUBLISH, { uri }));
-    };
-
-    const failure = error => {
-      dispatch({ type: ACTIONS.PUBLISH_FAIL });
-      dispatch(doOpenModal(MODALS.ERROR, { error: error.message }));
-    };
-
-    return Lbry.publish(publishPayload).then(success, failure);
+  const success = () => {
+    dispatch({
+      type: ACTIONS.PUBLISH_SUCCESS,
+      data: { pendingPublish: { ...publishPayload, isEdit } },
+    });
+    dispatch(doOpenModal(MODALS.PUBLISH, { uri }));
   };
+
+  const failure = error => {
+    dispatch({ type: ACTIONS.PUBLISH_FAIL });
+    dispatch(doOpenModal(MODALS.ERROR, { error: error.message }));
+  };
+
+  return Lbry.publish(publishPayload).then(success, failure);
 };
 
 // Calls claim_list_mine until any pending publishes are confirmed
diff --git a/src/renderer/redux/actions/search.js b/src/renderer/redux/actions/search.js
deleted file mode 100644
index 3aac1bf09..000000000
--- a/src/renderer/redux/actions/search.js
+++ /dev/null
@@ -1,176 +0,0 @@
-import * as ACTIONS from 'constants/action_types';
-import * as SEARCH_TYPES from 'constants/search';
-import { normalizeURI, buildURI, parseURI } from 'lbryURI';
-import { doResolveUri } from 'redux/actions/content';
-import { doNavigate } from 'redux/actions/navigation';
-import { selectCurrentPage } from 'redux/selectors/navigation';
-import { makeSelectSearchUris } from 'redux/selectors/search';
-import batchActions from 'util/batchActions';
-import handleFetchResponse from 'util/handle-fetch';
-
-export const doSearch = rawQuery => (dispatch, getState) => {
-  const state = getState();
-  const query = rawQuery.replace(/^lbry:\/\//i, '');
-
-  if (!query) {
-    dispatch({
-      type: ACTIONS.SEARCH_FAIL,
-    });
-    return;
-  }
-
-  // If we have already searched for something, we don't need to do anything
-  const urisForQuery = makeSelectSearchUris(query)(state);
-  if (urisForQuery && !!urisForQuery.length) {
-    return;
-  }
-
-  dispatch({
-    type: ACTIONS.SEARCH_START,
-  });
-
-  // If the user is on the file page with a pre-populated uri and they select
-  // the search option without typing anything, searchQuery will be empty
-  // We need to populate it so the input is filled on the search page
-  if (!state.search.searchQuery) {
-    dispatch({
-      type: ACTIONS.UPDATE_SEARCH_QUERY,
-      data: { searchQuery: query },
-    });
-  }
-
-  fetch(`https://lighthouse.lbry.io/search?s=${query}`)
-    .then(handleFetchResponse)
-    .then(data => {
-      const uris = [];
-      const actions = [];
-
-      data.forEach(result => {
-        const uri = buildURI({
-          claimName: result.name,
-          claimId: result.claimId,
-        });
-        actions.push(doResolveUri(uri));
-        uris.push(uri);
-      });
-
-      actions.push({
-        type: ACTIONS.SEARCH_SUCCESS,
-        data: {
-          query,
-          uris,
-        },
-      });
-      dispatch(batchActions(...actions));
-    })
-    .catch(() => {
-      dispatch({
-        type: ACTIONS.SEARCH_FAIL,
-      });
-    });
-};
-
-export const doUpdateSearchQuery = (query: string, shouldSkipSuggestions: ?boolean) => dispatch => {
-  dispatch({
-    type: ACTIONS.UPDATE_SEARCH_QUERY,
-    data: { query },
-  });
-
-  // Don't fetch new suggestions if the user just added a space
-  if (!query.endsWith(' ') || !shouldSkipSuggestions) {
-    dispatch(getSearchSuggestions(query));
-  }
-};
-
-export const getSearchSuggestions = (value: string) => dispatch => {
-  const query = value.trim();
-
-  const isPrefix = () => {
-    return query === '@' || query === 'lbry:' || query === 'lbry:/' || query === 'lbry://';
-  };
-
-  if (!query || isPrefix()) {
-    dispatch({
-      type: ACTIONS.UPDATE_SEARCH_SUGGESTIONS,
-      data: { suggestions: [] },
-    });
-    return;
-  }
-
-  let suggestions = [];
-  try {
-    // If the user is about to manually add the claim id ignore it until they
-    // actually add one. This would hardly ever happen, but then the search
-    // suggestions won't change just from adding a '#' after a uri
-    let uriQuery = query;
-    if (uriQuery.endsWith('#')) {
-      uriQuery = uriQuery.slice(0, -1);
-    }
-
-    const uri = normalizeURI(uriQuery);
-    const { claimName, isChannel } = parseURI(uri);
-
-    suggestions.push(
-      {
-        value: uri,
-        shorthand: isChannel ? claimName.slice(1) : claimName,
-        type: isChannel ? SEARCH_TYPES.CHANNEL : SEARCH_TYPES.FILE,
-      },
-      {
-        value: claimName,
-        type: SEARCH_TYPES.SEARCH,
-      }
-    );
-
-    // If it's a valid url, don't fetch any extra search results
-    return dispatch({
-      type: ACTIONS.UPDATE_SEARCH_SUGGESTIONS,
-      data: { suggestions },
-    });
-  } catch (e) {
-    suggestions.push({
-      value: query,
-      type: SEARCH_TYPES.SEARCH,
-    });
-  }
-
-  // Populate the current search query suggestion before fetching results
-  dispatch({
-    type: ACTIONS.UPDATE_SEARCH_SUGGESTIONS,
-    data: { suggestions },
-  });
-
-  // strip out any basic stuff for more accurate search results
-  let searchValue = value.replace(/lbry:\/\//g, '').replace(/-/g, ' ');
-  if (searchValue.includes('#')) {
-    // This should probably be more robust, but I think it's fine for now
-    // Remove everything after # to get rid of the claim id
-    searchValue = searchValue.substring(0, searchValue.indexOf('#'));
-  }
-
-  return fetch(`https://lighthouse.lbry.io/autocomplete?s=${searchValue}`)
-    .then(handleFetchResponse)
-    .then(apiSuggestions => {
-      const formattedSuggestions = apiSuggestions.slice(0, 6).map(suggestion => {
-        // This will need to be more robust when the api starts returning lbry uris
-        const isChannel = suggestion.startsWith('@');
-        const suggestionObj = {
-          value: isChannel ? `lbry://${suggestion}` : suggestion,
-          shorthand: isChannel ? suggestion.slice(1) : '',
-          type: isChannel ? 'channel' : 'search',
-        };
-
-        return suggestionObj;
-      });
-
-      suggestions = suggestions.concat(formattedSuggestions);
-      dispatch({
-        type: ACTIONS.UPDATE_SEARCH_SUGGESTIONS,
-        data: { suggestions },
-      });
-    })
-    .catch(() => {
-      // If the fetch fails, do nothing
-      // Basic search suggestions are already populated at this point
-    });
-};
diff --git a/src/renderer/redux/actions/settings.js b/src/renderer/redux/actions/settings.js
index e0fe6b1c5..08a4626ae 100644
--- a/src/renderer/redux/actions/settings.js
+++ b/src/renderer/redux/actions/settings.js
@@ -1,8 +1,6 @@
-import * as ACTIONS from 'constants/action_types';
-import * as SETTINGS from 'constants/settings';
 import Fs from 'fs';
 import Http from 'http';
-import Lbry from 'lbry';
+import { Lbry, ACTIONS, SETTINGS } from 'lbry-redux';
 import moment from 'moment';
 import analytics from 'analytics';
 
diff --git a/src/renderer/redux/actions/subscriptions.js b/src/renderer/redux/actions/subscriptions.js
index 53160ef8c..6f0dba49f 100644
--- a/src/renderer/redux/actions/subscriptions.js
+++ b/src/renderer/redux/actions/subscriptions.js
@@ -8,10 +8,9 @@ import type {
   SubscriptionNotifications,
 } from 'redux/reducers/subscriptions';
 import { selectSubscriptions } from 'redux/selectors/subscriptions';
-import Lbry from 'lbry';
+import { Lbry, buildURI } from 'lbry-redux';
 import { doPurchaseUri } from 'redux/actions/content';
 import { doNavigate } from 'redux/actions/navigation';
-import { buildURI } from 'lbryURI';
 import analytics from 'analytics';
 
 const CHECK_SUBSCRIPTIONS_INTERVAL = 60 * 60 * 1000;
diff --git a/src/renderer/redux/actions/user.js b/src/renderer/redux/actions/user.js
index 2c2e1a09e..25a9d5228 100644
--- a/src/renderer/redux/actions/user.js
+++ b/src/renderer/redux/actions/user.js
@@ -91,11 +91,11 @@ export function doUserPhoneReset() {
   };
 }
 
-export function doUserPhoneNew(phone, country_code) {
+export function doUserPhoneNew(phone, countryCode) {
   return dispatch => {
     dispatch({
       type: ACTIONS.USER_PHONE_NEW_STARTED,
-      data: { phone, country_code },
+      data: { phone, country_code: countryCode },
     });
 
     const success = () => {
@@ -112,10 +112,12 @@ export function doUserPhoneNew(phone, country_code) {
       });
     };
 
-    Lbryio.call('user', 'phone_number_new', { phone_number: phone, country_code }, 'post').then(
-      success,
-      failure
-    );
+    Lbryio.call(
+      'user',
+      'phone_number_new',
+      { phone_number: phone, country_code: countryCode },
+      'post'
+    ).then(success, failure);
   };
 }
 
diff --git a/src/renderer/redux/actions/wallet.js b/src/renderer/redux/actions/wallet.js
deleted file mode 100644
index a89ca9273..000000000
--- a/src/renderer/redux/actions/wallet.js
+++ /dev/null
@@ -1,190 +0,0 @@
-import * as ACTIONS from 'constants/action_types';
-import * as MODALS from 'constants/modal_types';
-import Lbry from 'lbry';
-import { doOpenModal, doShowSnackBar } from 'redux/actions/app';
-import { doNavigate } from 'redux/actions/navigation';
-import { selectBalance } from 'redux/selectors/wallet';
-
-export function doUpdateBalance() {
-  return (dispatch, getState) => {
-    const { wallet: { balance: balanceInStore } } = getState();
-    Lbry.wallet_balance().then(balance => {
-      if (balanceInStore !== balance) {
-        return dispatch({
-          type: ACTIONS.UPDATE_BALANCE,
-          data: {
-            balance,
-          },
-        });
-      }
-    });
-  };
-}
-
-export function doBalanceSubscribe() {
-  return dispatch => {
-    dispatch(doUpdateBalance());
-    setInterval(() => dispatch(doUpdateBalance()), 5000);
-  };
-}
-
-export function doFetchTransactions() {
-  return dispatch => {
-    dispatch({
-      type: ACTIONS.FETCH_TRANSACTIONS_STARTED,
-    });
-
-    Lbry.transaction_list().then(results => {
-      dispatch({
-        type: ACTIONS.FETCH_TRANSACTIONS_COMPLETED,
-        data: {
-          transactions: results,
-        },
-      });
-    });
-  };
-}
-
-export function doFetchBlock(height) {
-  return dispatch => {
-    Lbry.block_show({ height }).then(block => {
-      dispatch({
-        type: ACTIONS.FETCH_BLOCK_SUCCESS,
-        data: { block },
-      });
-    });
-  };
-}
-
-export function doGetNewAddress() {
-  return dispatch => {
-    dispatch({
-      type: ACTIONS.GET_NEW_ADDRESS_STARTED,
-    });
-
-    Lbry.wallet_new_address().then(address => {
-      localStorage.setItem('wallet_address', address);
-      dispatch({
-        type: ACTIONS.GET_NEW_ADDRESS_COMPLETED,
-        data: { address },
-      });
-    });
-  };
-}
-
-export function doCheckAddressIsMine(address) {
-  return dispatch => {
-    dispatch({
-      type: ACTIONS.CHECK_ADDRESS_IS_MINE_STARTED,
-    });
-
-    Lbry.wallet_is_address_mine({ address }).then(isMine => {
-      if (!isMine) dispatch(doGetNewAddress());
-
-      dispatch({
-        type: ACTIONS.CHECK_ADDRESS_IS_MINE_COMPLETED,
-      });
-    });
-  };
-}
-
-export function doSendDraftTransaction({ amount, address }) {
-  return (dispatch, getState) => {
-    const state = getState();
-    const balance = selectBalance(state);
-
-    if (balance - amount <= 0) {
-      dispatch(doOpenModal(MODALS.INSUFFICIENT_CREDITS));
-      return;
-    }
-
-    dispatch({
-      type: ACTIONS.SEND_TRANSACTION_STARTED,
-    });
-
-    const successCallback = results => {
-      if (results === true) {
-        dispatch({
-          type: ACTIONS.SEND_TRANSACTION_COMPLETED,
-        });
-        dispatch(
-          doShowSnackBar({
-            message: __(`You sent ${amount} LBC`),
-            linkText: __('History'),
-            linkTarget: __('/wallet'),
-          })
-        );
-      } else {
-        dispatch({
-          type: ACTIONS.SEND_TRANSACTION_FAILED,
-          data: { error: results },
-        });
-        dispatch(doOpenModal(MODALS.TRANSACTION_FAILED));
-      }
-    };
-
-    const errorCallback = error => {
-      dispatch({
-        type: ACTIONS.SEND_TRANSACTION_FAILED,
-        data: { error: error.message },
-      });
-      dispatch(doOpenModal(MODALS.TRANSACTION_FAILED));
-    };
-
-    Lbry.wallet_send({
-      amount,
-      address,
-    }).then(successCallback, errorCallback);
-  };
-}
-
-export function doSendSupport(amount, claimId, uri) {
-  return (dispatch, getState) => {
-    const state = getState();
-    const balance = selectBalance(state);
-
-    if (balance - amount <= 0) {
-      dispatch(doOpenModal(MODALS.INSUFFICIENT_CREDITS));
-      return;
-    }
-
-    dispatch({
-      type: ACTIONS.SUPPORT_TRANSACTION_STARTED,
-    });
-
-    const successCallback = results => {
-      if (results.txid) {
-        dispatch({
-          type: ACTIONS.SUPPORT_TRANSACTION_COMPLETED,
-        });
-        dispatch(
-          doShowSnackBar({
-            message: __(`You sent ${amount} LBC as support, Mahalo!`),
-            linkText: __('History'),
-            linkTarget: __('/wallet'),
-          })
-        );
-        dispatch(doNavigate('/show', { uri }));
-      } else {
-        dispatch({
-          type: ACTIONS.SUPPORT_TRANSACTION_FAILED,
-          data: { error: results.code },
-        });
-        dispatch(doOpenModal(MODALS.TRANSACTION_FAILED));
-      }
-    };
-
-    const errorCallback = error => {
-      dispatch({
-        type: ACTIONS.SUPPORT_TRANSACTION_FAILED,
-        data: { error: error.code },
-      });
-      dispatch(doOpenModal(MODALS.TRANSACTION_FAILED));
-    };
-
-    Lbry.wallet_send({
-      claim_id: claimId,
-      amount,
-    }).then(successCallback, errorCallback);
-  };
-}
diff --git a/src/renderer/redux/reducers/app.js b/src/renderer/redux/reducers/app.js
index ac8b8f5fb..188fd06e2 100644
--- a/src/renderer/redux/reducers/app.js
+++ b/src/renderer/redux/reducers/app.js
@@ -89,11 +89,10 @@ reducers[ACTIONS.AUTO_UPDATE_DOWNLOADED] = state =>
     autoUpdateDownloaded: true,
   });
 
-reducers[ACTIONS.AUTO_UPDATE_DECLINED] = state => {
-  return Object.assign({}, state, {
+reducers[ACTIONS.AUTO_UPDATE_DECLINED] = state =>
+  Object.assign({}, state, {
     autoUpdateDeclined: true,
   });
-};
 
 reducers[ACTIONS.UPGRADE_DOWNLOAD_COMPLETED] = (state, action) =>
   Object.assign({}, state, {
@@ -121,17 +120,15 @@ reducers[ACTIONS.SKIP_UPGRADE] = state => {
   });
 };
 
-reducers[ACTIONS.MEDIA_PLAY] = state => {
-  return Object.assign({}, state, {
+reducers[ACTIONS.MEDIA_PLAY] = state =>
+  Object.assign({}, state, {
     modalsAllowed: false,
   });
-};
 
-reducers[ACTIONS.MEDIA_PAUSE] = state => {
-  return Object.assign({}, state, {
+reducers[ACTIONS.MEDIA_PAUSE] = state =>
+  Object.assign({}, state, {
     modalsAllowed: true,
   });
-};
 
 reducers[ACTIONS.SET_PLAYING_URI] = (state, action) => {
   if (action.data.uri === null) {
diff --git a/src/renderer/redux/reducers/claims.js b/src/renderer/redux/reducers/claims.js
deleted file mode 100644
index f7c06f293..000000000
--- a/src/renderer/redux/reducers/claims.js
+++ /dev/null
@@ -1,187 +0,0 @@
-import * as ACTIONS from 'constants/action_types';
-
-const reducers = {};
-
-const defaultState = {};
-
-reducers[ACTIONS.RESOLVE_URIS_COMPLETED] = (state, action) => {
-  const { resolveInfo } = action.data;
-  const byUri = Object.assign({}, state.claimsByUri);
-  const byId = Object.assign({}, state.byId);
-
-  Object.entries(resolveInfo).forEach(([uri, { certificate, claim }]) => {
-    if (claim) {
-      byId[claim.claim_id] = claim;
-      byUri[uri] = claim.claim_id;
-    } else if (claim === undefined && certificate !== undefined) {
-      byId[certificate.claim_id] = certificate;
-      // Don't point URI at the channel certificate unless it actually is
-      // a channel URI. This is brittle.
-      if (!uri.split(certificate.name)[1].match(/\//)) {
-        byUri[uri] = certificate.claim_id;
-      } else {
-        byUri[uri] = null;
-      }
-    } else {
-      byUri[uri] = null;
-    }
-  });
-
-  return Object.assign({}, state, {
-    byId,
-    claimsByUri: byUri,
-  });
-};
-
-reducers[ACTIONS.FETCH_CLAIM_LIST_MINE_STARTED] = state =>
-  Object.assign({}, state, {
-    isFetchingClaimListMine: true,
-  });
-
-reducers[ACTIONS.FETCH_CLAIM_LIST_MINE_COMPLETED] = (state, action) => {
-  const { claims } = action.data;
-  const byId = Object.assign({}, state.byId);
-  const pendingById = Object.assign({}, state.pendingById);
-
-  claims
-    .filter(
-      claim => claim.category && (claim.category.match(/claim/) || claim.category.match(/update/))
-    )
-    .forEach(claim => {
-      byId[claim.claim_id] = claim;
-
-      const pending = Object.values(pendingById).find(
-        pendingClaim =>
-          pendingClaim.name === claim.name && pendingClaim.channel_name === claim.channel_name
-      );
-
-      if (pending) {
-        delete pendingById[pending.claim_id];
-      }
-    });
-
-  // Remove old timed out pending publishes
-  Object.values(pendingById)
-    .filter(pendingClaim => Date.now() - pendingClaim.time >= 20 * 60 * 1000)
-    .forEach(pendingClaim => {
-      delete pendingById[pendingClaim.claim_id];
-    });
-
-  return Object.assign({}, state, {
-    isFetchingClaimListMine: false,
-    myClaims: claims,
-    byId,
-    pendingById,
-  });
-};
-
-reducers[ACTIONS.FETCH_CHANNEL_LIST_STARTED] = state =>
-  Object.assign({}, state, { fetchingMyChannels: true });
-
-reducers[ACTIONS.FETCH_CHANNEL_LIST_COMPLETED] = (state, action) => {
-  const { claims } = action.data;
-  const myChannelClaims = new Set(state.myChannelClaims);
-  const byId = Object.assign({}, state.byId);
-
-  claims.forEach(claim => {
-    myChannelClaims.add(claim.claim_id);
-    byId[claims.claim_id] = claim;
-  });
-
-  return Object.assign({}, state, {
-    byId,
-    fetchingMyChannels: false,
-    myChannelClaims,
-  });
-};
-
-reducers[ACTIONS.FETCH_CHANNEL_CLAIMS_STARTED] = (state, action) => {
-  const { uri, page } = action.data;
-  const fetchingChannelClaims = Object.assign({}, state.fetchingChannelClaims);
-
-  fetchingChannelClaims[uri] = page;
-
-  return Object.assign({}, state, {
-    fetchingChannelClaims,
-  });
-};
-
-reducers[ACTIONS.FETCH_CHANNEL_CLAIMS_COMPLETED] = (state, action) => {
-  const { uri, claims, page } = action.data;
-
-  const claimsByChannel = Object.assign({}, state.claimsByChannel);
-  const byChannel = Object.assign({}, claimsByChannel[uri]);
-  const allClaimIds = new Set(byChannel.all);
-  const currentPageClaimIds = [];
-  const byId = Object.assign({}, state.byId);
-  const fetchingChannelClaims = Object.assign({}, state.fetchingChannelClaims);
-
-  if (claims !== undefined) {
-    claims.forEach(claim => {
-      allClaimIds.add(claim.claim_id);
-      currentPageClaimIds.push(claim.claim_id);
-      byId[claim.claim_id] = claim;
-    });
-  }
-
-  byChannel.all = allClaimIds;
-  byChannel[page] = currentPageClaimIds;
-  claimsByChannel[uri] = byChannel;
-  delete fetchingChannelClaims[uri];
-
-  return Object.assign({}, state, {
-    claimsByChannel,
-    byId,
-    fetchingChannelClaims,
-  });
-};
-
-reducers[ACTIONS.ABANDON_CLAIM_STARTED] = (state, action) => {
-  const { claimId } = action.data;
-  const abandoningById = Object.assign({}, state.abandoningById);
-
-  abandoningById[claimId] = true;
-
-  return Object.assign({}, state, {
-    abandoningById,
-  });
-};
-
-reducers[ACTIONS.ABANDON_CLAIM_SUCCEEDED] = (state, action) => {
-  const { claimId } = action.data;
-  const byId = Object.assign({}, state.byId);
-  const claimsByUri = Object.assign({}, state.claimsByUri);
-
-  Object.keys(claimsByUri).forEach(uri => {
-    if (claimsByUri[uri] === claimId) {
-      delete claimsByUri[uri];
-    }
-  });
-
-  delete byId[claimId];
-
-  return Object.assign({}, state, {
-    byId,
-    claimsByUri,
-  });
-};
-
-reducers[ACTIONS.CREATE_CHANNEL_COMPLETED] = (state, action) => {
-  const { channelClaim } = action.data;
-  const byId = Object.assign({}, state.byId);
-  const myChannelClaims = new Set(state.myChannelClaims);
-
-  byId[channelClaim.claim_id] = channelClaim;
-  myChannelClaims.add(channelClaim.claim_id);
-
-  return Object.assign({}, state, {
-    byId,
-    myChannelClaims,
-  });
-};
-
-export default function reducer(state = defaultState, action) {
-  const handler = reducers[action.type];
-  if (handler) return handler(state, action);
-  return state;
-}
diff --git a/src/renderer/redux/reducers/cost_info.js b/src/renderer/redux/reducers/cost_info.js
deleted file mode 100644
index 4137bb83f..000000000
--- a/src/renderer/redux/reducers/cost_info.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import * as ACTIONS from 'constants/action_types';
-
-const reducers = {};
-const defaultState = {};
-
-reducers[ACTIONS.FETCH_COST_INFO_STARTED] = (state, action) => {
-  const { uri } = action.data;
-  const newFetching = Object.assign({}, state.fetching);
-  newFetching[uri] = true;
-
-  return Object.assign({}, state, {
-    fetching: newFetching,
-  });
-};
-
-reducers[ACTIONS.FETCH_COST_INFO_COMPLETED] = (state, action) => {
-  const { uri, costInfo } = action.data;
-  const newByUri = Object.assign({}, state.byUri);
-  const newFetching = Object.assign({}, state.fetching);
-
-  newByUri[uri] = costInfo;
-  delete newFetching[uri];
-
-  return Object.assign({}, state, {
-    byUri: newByUri,
-    fetching: newFetching,
-  });
-};
-
-export default function reducer(state = defaultState, action) {
-  const handler = reducers[action.type];
-  if (handler) return handler(state, action);
-  return state;
-}
diff --git a/src/renderer/redux/reducers/file_info.js b/src/renderer/redux/reducers/file_info.js
deleted file mode 100644
index 0d9ed2431..000000000
--- a/src/renderer/redux/reducers/file_info.js
+++ /dev/null
@@ -1,156 +0,0 @@
-import * as ACTIONS from 'constants/action_types';
-
-const reducers = {};
-const defaultState = {};
-
-reducers[ACTIONS.FILE_LIST_STARTED] = state =>
-  Object.assign({}, state, {
-    isFetchingFileList: true,
-  });
-
-reducers[ACTIONS.FILE_LIST_SUCCEEDED] = (state, action) => {
-  const { fileInfos } = action.data;
-  const newByOutpoint = Object.assign({}, state.byOutpoint);
-  const pendingByOutpoint = Object.assign({}, state.pendingByOutpoint);
-
-  fileInfos.forEach(fileInfo => {
-    const { outpoint } = fileInfo;
-
-    if (outpoint) newByOutpoint[fileInfo.outpoint] = fileInfo;
-  });
-
-  return Object.assign({}, state, {
-    isFetchingFileList: false,
-    byOutpoint: newByOutpoint,
-    pendingByOutpoint,
-  });
-};
-
-reducers[ACTIONS.FETCH_FILE_INFO_STARTED] = (state, action) => {
-  const { outpoint } = action.data;
-  const newFetching = Object.assign({}, state.fetching);
-
-  newFetching[outpoint] = true;
-
-  return Object.assign({}, state, {
-    fetching: newFetching,
-  });
-};
-
-reducers[ACTIONS.FETCH_FILE_INFO_COMPLETED] = (state, action) => {
-  const { fileInfo, outpoint } = action.data;
-
-  const newByOutpoint = Object.assign({}, state.byOutpoint);
-  const newFetching = Object.assign({}, state.fetching);
-
-  newByOutpoint[outpoint] = fileInfo;
-  delete newFetching[outpoint];
-
-  return Object.assign({}, state, {
-    byOutpoint: newByOutpoint,
-    fetching: newFetching,
-  });
-};
-
-reducers[ACTIONS.DOWNLOADING_STARTED] = (state, action) => {
-  const { uri, outpoint, fileInfo } = action.data;
-
-  const newByOutpoint = Object.assign({}, state.byOutpoint);
-  const newDownloading = Object.assign({}, state.downloadingByOutpoint);
-  const newLoading = Object.assign({}, state.urisLoading);
-
-  newDownloading[outpoint] = true;
-  newByOutpoint[outpoint] = fileInfo;
-  delete newLoading[uri];
-
-  return Object.assign({}, state, {
-    downloadingByOutpoint: newDownloading,
-    urisLoading: newLoading,
-    byOutpoint: newByOutpoint,
-  });
-};
-
-reducers[ACTIONS.DOWNLOADING_PROGRESSED] = (state, action) => {
-  const { outpoint, fileInfo } = action.data;
-
-  const newByOutpoint = Object.assign({}, state.byOutpoint);
-  const newDownloading = Object.assign({}, state.downloadingByOutpoint);
-
-  newByOutpoint[outpoint] = fileInfo;
-  newDownloading[outpoint] = true;
-
-  return Object.assign({}, state, {
-    byOutpoint: newByOutpoint,
-    downloadingByOutpoint: newDownloading,
-  });
-};
-
-reducers[ACTIONS.DOWNLOADING_COMPLETED] = (state, action) => {
-  const { outpoint, fileInfo } = action.data;
-
-  const newByOutpoint = Object.assign({}, state.byOutpoint);
-  const newDownloading = Object.assign({}, state.downloadingByOutpoint);
-
-  newByOutpoint[outpoint] = fileInfo;
-  delete newDownloading[outpoint];
-
-  return Object.assign({}, state, {
-    byOutpoint: newByOutpoint,
-    downloadingByOutpoint: newDownloading,
-  });
-};
-
-reducers[ACTIONS.FILE_DELETE] = (state, action) => {
-  const { outpoint } = action.data;
-
-  const newByOutpoint = Object.assign({}, state.byOutpoint);
-  const downloadingByOutpoint = Object.assign({}, state.downloadingByOutpoint);
-
-  delete newByOutpoint[outpoint];
-  delete downloadingByOutpoint[outpoint];
-
-  return Object.assign({}, state, {
-    byOutpoint: newByOutpoint,
-    downloadingByOutpoint,
-  });
-};
-
-reducers[ACTIONS.LOADING_VIDEO_STARTED] = (state, action) => {
-  const { uri } = action.data;
-
-  const newLoading = Object.assign({}, state.urisLoading);
-
-  newLoading[uri] = true;
-
-  return Object.assign({}, state, {
-    urisLoading: newLoading,
-  });
-};
-
-reducers[ACTIONS.LOADING_VIDEO_FAILED] = (state, action) => {
-  const { uri } = action.data;
-
-  const newLoading = Object.assign({}, state.urisLoading);
-
-  delete newLoading[uri];
-
-  return Object.assign({}, state, {
-    urisLoading: newLoading,
-  });
-};
-
-reducers[ACTIONS.FETCH_DATE] = (state, action) => {
-  const { time } = action.data;
-  if (time) {
-    return Object.assign({}, state, {
-      publishedDate: time,
-    });
-  }
-  return null;
-};
-
-export default function reducer(state = defaultState, action) {
-  const handler = reducers[action.type];
-  if (handler) return handler(state, action);
-  return state;
-}
diff --git a/src/renderer/redux/reducers/publish.js b/src/renderer/redux/reducers/publish.js
index 8bc91918b..d314d7443 100644
--- a/src/renderer/redux/reducers/publish.js
+++ b/src/renderer/redux/reducers/publish.js
@@ -1,6 +1,6 @@
 // @flow
 import { handleActions } from 'util/redux-utils';
-import { buildURI } from 'lbryURI';
+import { buildURI } from 'lbry-redux';
 import * as ACTIONS from 'constants/action_types';
 import { CHANNEL_ANONYMOUS } from 'constants/claim';
 
diff --git a/src/renderer/redux/reducers/search.js b/src/renderer/redux/reducers/search.js
deleted file mode 100644
index 7a2a92ca1..000000000
--- a/src/renderer/redux/reducers/search.js
+++ /dev/null
@@ -1,103 +0,0 @@
-// @flow
-import * as ACTIONS from 'constants/action_types';
-import { handleActions } from 'util/redux-utils';
-
-type SearchSuccess = {
-  type: ACTIONS.SEARCH_SUCCESS,
-  data: {
-    query: string,
-    uris: Array<string>,
-  },
-};
-
-type UpdateSearchQuery = {
-  type: ACTIONS.UPDATE_SEARCH_QUERY,
-  data: {
-    query: string,
-  },
-};
-
-type SearchSuggestion = {
-  value: string,
-  shorthand: string,
-  type: string,
-};
-
-type UpdateSearchSuggestions = {
-  type: ACTIONS.UPDATE_SEARCH_SUGGESTIONS,
-  data: {
-    suggestions: Array<SearchSuggestion>,
-  },
-};
-
-type SearchState = {
-  isActive: boolean,
-  searchQuery: string,
-  suggestions: Array<SearchSuggestion>,
-  urisByQuery: {},
-};
-
-const defaultState = {
-  isActive: false,
-  searchQuery: '', // needs to be an empty string for input focusing
-  suggestions: [],
-  urisByQuery: {},
-};
-
-export default handleActions(
-  {
-    [ACTIONS.SEARCH_START]: (state: SearchState): SearchState => ({
-      ...state,
-      searching: true,
-    }),
-    [ACTIONS.SEARCH_SUCCESS]: (state: SearchState, action: SearchSuccess): SearchState => {
-      const { query, uris } = action.data;
-
-      return {
-        ...state,
-        searching: false,
-        urisByQuery: Object.assign({}, state.urisByQuery, { [query]: uris }),
-      };
-    },
-
-    [ACTIONS.SEARCH_FAIL]: (state: SearchState): SearchState => ({
-      ...state,
-      searching: false,
-    }),
-
-    [ACTIONS.UPDATE_SEARCH_QUERY]: (
-      state: SearchState,
-      action: UpdateSearchQuery
-    ): SearchState => ({
-      ...state,
-      searchQuery: action.data.query,
-      isActive: true,
-    }),
-
-    [ACTIONS.UPDATE_SEARCH_SUGGESTIONS]: (
-      state: SearchState,
-      action: UpdateSearchSuggestions
-    ): SearchState => ({
-      ...state,
-      suggestions: action.data.suggestions,
-    }),
-
-    // clear the searchQuery on back/forward
-    // it may be populated by the page title for search/file pages
-    // if going home, it should be blank
-    [ACTIONS.HISTORY_NAVIGATE]: (state: SearchState): SearchState => ({
-      ...state,
-      searchQuery: '',
-      suggestions: [],
-      isActive: false,
-    }),
-    // sets isActive to false so the uri will be populated correctly if the
-    // user is on a file page. The search query will still be present on any
-    // other page
-    [ACTIONS.CLOSE_MODAL]: (state: SearchState): SearchState => ({
-      ...state,
-      isActive: false,
-    }),
-  },
-  defaultState
-);
diff --git a/src/renderer/redux/reducers/wallet.js b/src/renderer/redux/reducers/wallet.js
deleted file mode 100644
index 590404ce8..000000000
--- a/src/renderer/redux/reducers/wallet.js
+++ /dev/null
@@ -1,114 +0,0 @@
-import * as ACTIONS from 'constants/action_types';
-
-const reducers = {};
-const receiveAddress = localStorage.getItem('receiveAddress');
-
-const defaultState = {
-  balance: undefined,
-  blocks: {},
-  transactions: {},
-  fetchingTransactions: false,
-  receiveAddress,
-  gettingNewAddress: false,
-  sendingSupport: false,
-  sendingTx: false,
-};
-
-reducers[ACTIONS.FETCH_TRANSACTIONS_STARTED] = state =>
-  Object.assign({}, state, {
-    fetchingTransactions: true,
-  });
-
-reducers[ACTIONS.FETCH_TRANSACTIONS_COMPLETED] = (state, action) => {
-  const byId = Object.assign({}, state.transactions);
-
-  const { transactions } = action.data;
-
-  transactions.forEach(transaction => {
-    byId[transaction.txid] = transaction;
-  });
-
-  return Object.assign({}, state, {
-    transactions: byId,
-    fetchingTransactions: false,
-  });
-};
-
-reducers[ACTIONS.GET_NEW_ADDRESS_STARTED] = state =>
-  Object.assign({}, state, {
-    gettingNewAddress: true,
-  });
-
-reducers[ACTIONS.GET_NEW_ADDRESS_COMPLETED] = (state, action) => {
-  const { address } = action.data;
-
-  localStorage.setItem('receiveAddress', address);
-  return Object.assign({}, state, {
-    gettingNewAddress: false,
-    receiveAddress: address,
-  });
-};
-
-reducers[ACTIONS.UPDATE_BALANCE] = (state, action) =>
-  Object.assign({}, state, {
-    balance: action.data.balance,
-  });
-
-reducers[ACTIONS.CHECK_ADDRESS_IS_MINE_STARTED] = state =>
-  Object.assign({}, state, {
-    checkingAddressOwnership: true,
-  });
-
-reducers[ACTIONS.CHECK_ADDRESS_IS_MINE_COMPLETED] = state =>
-  Object.assign({}, state, {
-    checkingAddressOwnership: false,
-  });
-
-reducers[ACTIONS.SEND_TRANSACTION_STARTED] = state => {
-  return Object.assign({}, state, {
-    sendingTx: true,
-  });
-};
-
-reducers[ACTIONS.SEND_TRANSACTION_COMPLETED] = state =>
-  Object.assign({}, state, {
-    sendingTx: false,
-  });
-
-reducers[ACTIONS.SEND_TRANSACTION_FAILED] = (state, action) => {
-  return Object.assign({}, state, {
-    sendingTx: false,
-    error: action.data.error,
-  });
-};
-
-reducers[ACTIONS.SUPPORT_TRANSACTION_STARTED] = state =>
-  Object.assign({}, state, {
-    sendingSupport: true,
-  });
-
-reducers[ACTIONS.SUPPORT_TRANSACTION_COMPLETED] = state =>
-  Object.assign({}, state, {
-    sendingSupport: false,
-  });
-
-reducers[ACTIONS.SUPPORT_TRANSACTION_FAILED] = (state, action) =>
-  Object.assign({}, state, {
-    error: action.data.error,
-    sendingSupport: false,
-  });
-
-reducers[ACTIONS.FETCH_BLOCK_SUCCESS] = (state, action) => {
-  const { block, block: { height } } = action.data;
-  const blocks = Object.assign({}, state.blocks);
-
-  blocks[height] = block;
-
-  return Object.assign({}, state, { blocks });
-};
-
-export default function reducer(state = defaultState, action) {
-  const handler = reducers[action.type];
-  if (handler) return handler(state, action);
-  return state;
-}
diff --git a/src/renderer/redux/selectors/claims.js b/src/renderer/redux/selectors/claims.js
deleted file mode 100644
index bb3c7ae04..000000000
--- a/src/renderer/redux/selectors/claims.js
+++ /dev/null
@@ -1,179 +0,0 @@
-import { normalizeURI } from 'lbryURI';
-import { makeSelectCurrentParam } from 'redux/selectors/navigation';
-import { createSelector } from 'reselect';
-
-const selectState = state => state.claims || {};
-
-export const selectClaimsById = createSelector(selectState, state => state.byId || {});
-
-export const selectClaimById = id =>
-  createSelector(selectClaimsById, claims => {
-    const claimById = claims[id];
-    return claimById;
-  });
-
-export const selectClaimsByUri = createSelector(selectState, selectClaimsById, (state, byId) => {
-  const byUri = state.claimsByUri || {};
-  const claims = {};
-
-  Object.keys(byUri).forEach(uri => {
-    const claimId = byUri[uri];
-
-    // NOTE returning a null claim allows us to differentiate between an
-    // undefined (never fetched claim) and one which just doesn't exist. Not
-    // the cleanest solution but couldn't think of anything better right now
-    if (claimId === null) {
-      claims[uri] = null;
-    } else {
-      claims[uri] = byId[claimId];
-    }
-  });
-
-  return claims;
-});
-
-export const selectAllClaimsByChannel = createSelector(
-  selectState,
-  state => state.claimsByChannel || {}
-);
-
-export const makeSelectClaimForUri = uri =>
-  createSelector(selectClaimsByUri, claims => claims && claims[normalizeURI(uri)]);
-
-export const selectMyClaimsRaw = createSelector(selectState, state => state.myClaims);
-
-export const selectAbandoningIds = createSelector(selectState, state =>
-  Object.keys(state.abandoningById || {})
-);
-
-export const selectMyActiveClaims = createSelector(
-  selectMyClaimsRaw,
-  selectAbandoningIds,
-  (claims, abandoningIds) =>
-    new Set(
-      claims &&
-        claims
-          .map(claim => claim.claim_id)
-          .filter(claimId => Object.keys(abandoningIds).indexOf(claimId) === -1)
-    )
-);
-
-export const makeSelectClaimIsMine = rawUri => {
-  const uri = normalizeURI(rawUri);
-  return createSelector(
-    selectClaimsByUri,
-    selectMyActiveClaims,
-    (claims, myClaims) =>
-      claims && claims[uri] && claims[uri].claim_id && myClaims.has(claims[uri].claim_id)
-  );
-};
-
-export const selectAllFetchingChannelClaims = createSelector(
-  selectState,
-  state => state.fetchingChannelClaims || {}
-);
-
-export const makeSelectFetchingChannelClaims = uri =>
-  createSelector(selectAllFetchingChannelClaims, fetching => fetching && fetching[uri]);
-
-export const makeSelectClaimsInChannelForCurrentPage = uri => {
-  const pageSelector = makeSelectCurrentParam('page');
-
-  return createSelector(
-    selectClaimsById,
-    selectAllClaimsByChannel,
-    pageSelector,
-    (byId, allClaims, page) => {
-      const byChannel = allClaims[uri] || {};
-      const claimIds = byChannel[page || 1];
-
-      if (!claimIds) return claimIds;
-
-      return claimIds.map(claimId => byId[claimId]);
-    }
-  );
-};
-
-export const makeSelectMetadataForUri = uri =>
-  createSelector(makeSelectClaimForUri(uri), claim => {
-    const metadata = claim && claim.value && claim.value.stream && claim.value.stream.metadata;
-
-    return metadata || (claim === undefined ? undefined : null);
-  });
-
-export const makeSelectTitleForUri = uri =>
-  createSelector(makeSelectMetadataForUri(uri), metadata => metadata && metadata.title);
-
-export const makeSelectContentTypeForUri = uri =>
-  createSelector(makeSelectClaimForUri(uri), claim => {
-    const source = claim && claim.value && claim.value.stream && claim.value.stream.source;
-    return source ? source.contentType : undefined;
-  });
-
-export const selectIsFetchingClaimListMine = createSelector(
-  selectState,
-  state => state.isFetchingClaimListMine
-);
-
-export const selectPendingClaims = createSelector(selectState, state =>
-  Object.values(state.pendingById || {})
-);
-
-export const selectMyClaims = createSelector(
-  selectMyActiveClaims,
-  selectClaimsById,
-  selectAbandoningIds,
-  selectPendingClaims,
-  (myClaimIds, byId, abandoningIds, pendingClaims) => {
-    const claims = [];
-
-    myClaimIds.forEach(id => {
-      const claim = byId[id];
-
-      if (claim && abandoningIds.indexOf(id) === -1) claims.push(claim);
-    });
-
-    return [...claims, ...pendingClaims];
-  }
-);
-
-export const selectMyClaimsWithoutChannels = createSelector(selectMyClaims, myClaims =>
-  myClaims.filter(claim => !claim.name.match(/^@/))
-);
-
-export const selectAllMyClaimsByOutpoint = createSelector(
-  selectMyClaimsRaw,
-  claims =>
-    new Set(claims && claims.length ? claims.map(claim => `${claim.txid}:${claim.nout}`) : null)
-);
-
-export const selectMyClaimsOutpoints = createSelector(selectMyClaims, myClaims => {
-  const outpoints = [];
-
-  myClaims.forEach(claim => outpoints.push(`${claim.txid}:${claim.nout}`));
-
-  return outpoints;
-});
-
-export const selectFetchingMyChannels = createSelector(
-  selectState,
-  state => state.fetchingMyChannels
-);
-
-export const selectMyChannelClaims = createSelector(
-  selectState,
-  selectClaimsById,
-  (state, byId) => {
-    const ids = state.myChannelClaims || [];
-    const claims = [];
-
-    ids.forEach(id => {
-      if (byId[id]) {
-        // I'm not sure why this check is necessary, but it ought to be a quick fix for https://github.com/lbryio/lbry-app/issues/544
-        claims.push(byId[id]);
-      }
-    });
-
-    return claims;
-  }
-);
diff --git a/src/renderer/redux/selectors/content.js b/src/renderer/redux/selectors/content.js
index 371c59764..346f044c1 100644
--- a/src/renderer/redux/selectors/content.js
+++ b/src/renderer/redux/selectors/content.js
@@ -9,16 +9,8 @@ export const selectFetchingFeaturedUris = createSelector(
   state => state.fetchingFeaturedContent
 );
 
-export const selectResolvingUris = createSelector(selectState, state => state.resolvingUris || []);
-
 export const selectPlayingUri = createSelector(selectState, state => state.playingUri);
 
-export const makeSelectIsUriResolving = uri =>
-  createSelector(
-    selectResolvingUris,
-    resolvingUris => resolvingUris && resolvingUris.indexOf(uri) !== -1
-  );
-
 export const selectChannelClaimCounts = createSelector(
   selectState,
   state => state.channelClaimCounts || {}
diff --git a/src/renderer/redux/selectors/cost_info.js b/src/renderer/redux/selectors/cost_info.js
deleted file mode 100644
index 04d5b09e5..000000000
--- a/src/renderer/redux/selectors/cost_info.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { createSelector } from 'reselect';
-import { selectCurrentParams } from 'redux/selectors/navigation';
-
-export const selectState = state => state.costInfo || {};
-
-export const selectAllCostInfoByUri = createSelector(selectState, state => state.byUri || {});
-
-export const makeSelectCostInfoForUri = uri =>
-  createSelector(selectAllCostInfoByUri, costInfos => costInfos && costInfos[uri]);
-
-export const selectCostForCurrentPageUri = createSelector(
-  selectAllCostInfoByUri,
-  selectCurrentParams,
-  (costInfo, params) => (params.uri && costInfo[params.uri] ? costInfo[params.uri].cost : undefined)
-);
-
-export const selectFetchingCostInfo = createSelector(selectState, state => state.fetching || {});
-
-export const makeSelectFetchingCostInfoForUri = uri =>
-  createSelector(selectFetchingCostInfo, fetchingByUri => fetchingByUri && fetchingByUri[uri]);
diff --git a/src/renderer/redux/selectors/file_info.js b/src/renderer/redux/selectors/file_info.js
index b971328f5..801ced0b4 100644
--- a/src/renderer/redux/selectors/file_info.js
+++ b/src/renderer/redux/selectors/file_info.js
@@ -178,7 +178,7 @@ export const selectSearchDownloadUris = query =>
 
           if (channelName) {
             const claim = claimsById[claimId];
-            if (claim.value) {
+            if (claim && claim.value) {
               uriParams.claimId = claim.value.publisherSignature.certificateId;
             } else {
               uriParams.claimId = claimId;
diff --git a/src/renderer/redux/selectors/media.js b/src/renderer/redux/selectors/media.js
index 804b1190b..40a6725e1 100644
--- a/src/renderer/redux/selectors/media.js
+++ b/src/renderer/redux/selectors/media.js
@@ -1,13 +1,12 @@
-import * as settings from 'constants/settings';
 import { createSelector } from 'reselect';
-import { makeSelectClaimForUri } from 'redux/selectors/claims';
+import { makeSelectClaimForUri } from 'lbry-redux';
 
-const _selectState = state => state.media || {};
+const selectState = state => state.media || {};
 
-export const selectMediaPaused = createSelector(_selectState, state => state.paused);
+export const selectMediaPaused = createSelector(selectState, state => state.paused);
 
 export const makeSelectMediaPositionForUri = uri =>
-  createSelector(_selectState, makeSelectClaimForUri(uri), (state, claim) => {
+  createSelector(selectState, makeSelectClaimForUri(uri), (state, claim) => {
     const outpoint = `${claim.txid}:${claim.nout}`;
     return state.positions[outpoint] || null;
   });
diff --git a/src/renderer/redux/selectors/navigation.js b/src/renderer/redux/selectors/navigation.js
deleted file mode 100644
index f4acc3034..000000000
--- a/src/renderer/redux/selectors/navigation.js
+++ /dev/null
@@ -1,202 +0,0 @@
-import { createSelector } from 'reselect';
-import { parseQueryParams } from 'util/query_params';
-
-export const selectState = state => state.navigation || {};
-
-export const selectCurrentPath = createSelector(selectState, state => state.currentPath);
-
-export const computePageFromPath = path => path.replace(/^\//, '').split('?')[0];
-
-export const selectCurrentPage = createSelector(selectCurrentPath, path =>
-  computePageFromPath(path)
-);
-
-export const selectCurrentParams = createSelector(selectCurrentPath, path => {
-  if (path === undefined) return {};
-  if (!path.match(/\?/)) return {};
-
-  return parseQueryParams(path.split('?')[1]);
-});
-
-export const makeSelectCurrentParam = param =>
-  createSelector(selectCurrentParams, params => (params ? params[param] : undefined));
-
-export const selectPathAfterAuth = createSelector(selectState, state => state.pathAfterAuth);
-
-export const selectIsBackDisabled = createSelector(selectState, state => state.index === 0);
-
-export const selectIsForwardDisabled = createSelector(
-  selectState,
-  state => state.index === state.stack.length - 1
-);
-
-export const selectIsHome = createSelector(selectCurrentPage, page => page === 'discover');
-
-export const selectHistoryIndex = createSelector(selectState, state => state.index);
-
-export const selectHistoryStack = createSelector(selectState, state => state.stack);
-
-// returns current page attributes (scrollY, path)
-export const selectActiveHistoryEntry = createSelector(
-  selectState,
-  state => state.stack[state.index]
-);
-
-export const selectPageTitle = createSelector(selectCurrentPage, page => {
-  switch (page) {
-    default:
-      return '';
-  }
-});
-
-export const selectNavLinks = createSelector(
-  selectCurrentPage,
-  selectHistoryStack,
-  (currentPage, historyStack) => {
-    const isWalletPage = page =>
-      page === 'wallet' ||
-      page === 'send' ||
-      page === 'getcredits' ||
-      page === 'rewards' ||
-      page === 'history' ||
-      page === 'invite';
-
-    const isMyLbryPage = page =>
-      page === 'downloaded' || page === 'published' || page === 'settings';
-
-    const previousStack = historyStack.slice().reverse();
-
-    const getPreviousSubLinkPath = checkIfValidPage => {
-      for (let i = 0; i < previousStack.length; i += 1) {
-        const currentStackItem = previousStack[i];
-
-        // Trim off the "/" from the path
-        const pageInStack = currentStackItem.path.slice(1);
-        if (checkIfValidPage(pageInStack)) {
-          return currentStackItem.path;
-        }
-      }
-
-      return undefined;
-    };
-
-    // Gets the last active sublink in a section
-    const getActiveSublink = category => {
-      if (category === 'wallet') {
-        const previousPath = getPreviousSubLinkPath(isWalletPage);
-        return previousPath || '/wallet';
-      } else if (category === 'myLbry') {
-        const previousPath = getPreviousSubLinkPath(isMyLbryPage);
-        return previousPath || '/downloaded';
-      }
-
-      return undefined;
-    };
-
-    const isCurrentlyWalletPage = isWalletPage(currentPage);
-    const isCurrentlyMyLbryPage = isMyLbryPage(currentPage);
-
-    const walletSubLinks = [
-      {
-        label: 'Overview',
-        path: '/wallet',
-        active: currentPage === 'wallet',
-      },
-      {
-        label: 'Send & Recieve',
-        path: '/send',
-        active: currentPage === 'send',
-      },
-      {
-        label: 'Get Credits',
-        path: '/getcredits',
-        active: currentPage === 'getcredits',
-      },
-      {
-        label: 'Rewards',
-        path: '/rewards',
-        active: currentPage === 'rewards',
-      },
-      {
-        label: 'Invites',
-        path: '/invite',
-        active: currentPage === 'invite',
-      },
-      {
-        label: 'Transactions',
-        path: '/history',
-        active: currentPage === 'history',
-      },
-    ];
-
-    const myLbrySubLinks = [
-      {
-        label: 'Downloads',
-        path: '/downloaded',
-        active: currentPage === 'downloaded',
-      },
-      {
-        label: 'Publishes',
-        path: '/published',
-        active: currentPage === 'published',
-      },
-      {
-        label: 'Settings',
-        path: '/settings',
-        active: currentPage === 'settings',
-      },
-      {
-        label: 'Backup',
-        path: '/backup',
-        active: currentPage === 'backup',
-      },
-    ];
-
-    const navLinks = {
-      primary: [
-        {
-          label: 'Explore',
-          path: '/discover',
-          active: currentPage === 'discover',
-          icon: 'Compass',
-        },
-        {
-          label: 'Subscriptions',
-          path: '/subscriptions',
-          active: currentPage === 'subscriptions',
-          icon: 'AtSign',
-        },
-      ],
-      secondary: [
-        {
-          label: 'Wallet',
-          icon: 'CreditCard',
-          subLinks: walletSubLinks,
-          path: isCurrentlyWalletPage ? '/wallet' : getActiveSublink('wallet'),
-          active: isWalletPage(currentPage),
-        },
-        {
-          label: 'My LBRY',
-          icon: 'Settings',
-          subLinks: myLbrySubLinks,
-          path: isCurrentlyMyLbryPage ? '/downloaded' : getActiveSublink('myLbry'),
-          active: isMyLbryPage(currentPage),
-        },
-        {
-          label: 'Publish',
-          icon: 'UploadCloud',
-          path: '/publish',
-          active: currentPage === 'publish',
-        },
-        {
-          label: 'Help',
-          path: '/help',
-          active: currentPage === 'help',
-          icon: 'HelpCircle',
-        },
-      ],
-    };
-
-    return navLinks;
-  }
-);
diff --git a/src/renderer/redux/selectors/publish.js b/src/renderer/redux/selectors/publish.js
index 21f27d7d1..e0d1468ab 100644
--- a/src/renderer/redux/selectors/publish.js
+++ b/src/renderer/redux/selectors/publish.js
@@ -1,5 +1,5 @@
 import { createSelector } from 'reselect';
-import { parseURI } from 'lbryURI';
+import { parseURI } from 'lbry-redux';
 
 const selectState = state => state.publish || {};
 
@@ -10,7 +10,7 @@ export const selectPendingPublishes = createSelector(
 
 export const selectPendingPublishesLessEdits = createSelector(
   selectPendingPublishes,
-  pendingPublishes => pendingPublishes.filter(pendingPublish => !pendingPublish.sources)
+  pendingPublishes => pendingPublishes.filter(pendingPublish => !pendingPublish.isEdit)
 );
 
 export const selectPublishFormValues = createSelector(selectState, state => {
diff --git a/src/renderer/redux/selectors/search.js b/src/renderer/redux/selectors/search.js
deleted file mode 100644
index c7e983ced..000000000
--- a/src/renderer/redux/selectors/search.js
+++ /dev/null
@@ -1,39 +0,0 @@
-import { selectCurrentPage, selectCurrentParams } from 'redux/selectors/navigation';
-import { createSelector } from 'reselect';
-
-export const selectState = state => state.search || {};
-
-export const selectSearchValue = createSelector(selectState, state => {
-  return state.searchQuery;
-});
-
-export const selectSearchQuery = createSelector(
-  selectCurrentPage,
-  selectCurrentParams,
-  (page, params) => (page === 'search' ? params && params.query : null)
-);
-
-export const selectIsSearching = createSelector(selectState, state => state.searching);
-
-export const selectSearchUrisByQuery = createSelector(selectState, state => state.urisByQuery);
-
-export const makeSelectSearchUris = query =>
-  // replace statement below is kind of ugly, and repeated in doSearch action
-  createSelector(
-    selectSearchUrisByQuery,
-    byQuery => byQuery[query ? query.replace(/^lbry:\/\//i, '') : query]
-  );
-
-export const selectWunderBarAddress = createSelector(
-  selectCurrentPage,
-  selectSearchQuery,
-  selectCurrentParams,
-  (page, query, params) => {
-    // only populate the wunderbar address if we are on the file/channel pages
-    // or show the search query
-    if (page === 'show') {
-      return params.uri;
-    }
-    return query;
-  }
-);
diff --git a/src/renderer/redux/selectors/subscriptions.js b/src/renderer/redux/selectors/subscriptions.js
index 30efb5dc4..8f5f9d6ba 100644
--- a/src/renderer/redux/selectors/subscriptions.js
+++ b/src/renderer/redux/selectors/subscriptions.js
@@ -1,5 +1,5 @@
 import { createSelector } from 'reselect';
-import { selectAllClaimsByChannel, selectClaimsById } from './claims';
+import { selectAllClaimsByChannel, selectClaimsById } from 'lbry-redux';
 
 // get the entire subscriptions state
 const selectState = state => state.subscriptions || {};
diff --git a/src/renderer/redux/selectors/wallet.js b/src/renderer/redux/selectors/wallet.js
deleted file mode 100644
index d5fd9326d..000000000
--- a/src/renderer/redux/selectors/wallet.js
+++ /dev/null
@@ -1,105 +0,0 @@
-import { createSelector } from 'reselect';
-
-export const selectState = state => state.wallet || {};
-
-export const selectBalance = createSelector(selectState, state => state.balance);
-
-export const selectTransactionsById = createSelector(selectState, state => state.transactions);
-
-export const selectTransactionItems = createSelector(selectTransactionsById, byId => {
-  const items = [];
-
-  Object.keys(byId).forEach(txid => {
-    const tx = byId[txid];
-
-    // ignore dust/fees
-    // it is fee only txn if all infos are also empty
-    if (
-      Math.abs(tx.value) === Math.abs(tx.fee) &&
-      tx.claim_info.length === 0 &&
-      tx.support_info.length === 0 &&
-      tx.update_info.length === 0
-    ) {
-      return;
-    }
-
-    const append = [];
-
-    append.push(
-      ...tx.claim_info.map(item =>
-        Object.assign({}, tx, item, {
-          type: item.claim_name[0] === '@' ? 'channel' : 'publish',
-        })
-      )
-    );
-    append.push(
-      ...tx.support_info.map(item =>
-        Object.assign({}, tx, item, {
-          type: !item.is_tip ? 'support' : 'tip',
-        })
-      )
-    );
-    append.push(...tx.update_info.map(item => Object.assign({}, tx, item, { type: 'update' })));
-
-    if (!append.length) {
-      append.push(
-        Object.assign({}, tx, {
-          type: tx.value < 0 ? 'spend' : 'receive',
-        })
-      );
-    }
-
-    items.push(
-      ...append.map(item => {
-        // value on transaction, amount on outpoint
-        // amount is always positive, but should match sign of value
-        const amount = parseFloat(item.balance_delta ? item.balance_delta : item.value);
-
-        return {
-          txid,
-          date: tx.timestamp ? new Date(Number(tx.timestamp) * 1000) : null,
-          amount,
-          fee: amount < 0 ? -1 * tx.fee / append.length : 0,
-          claim_id: item.claim_id,
-          claim_name: item.claim_name,
-          type: item.type || 'send',
-          nout: item.nout,
-        };
-      })
-    );
-  });
-  return items.reverse();
-});
-
-export const selectRecentTransactions = createSelector(selectTransactionItems, transactions => {
-  const threshold = new Date();
-  threshold.setDate(threshold.getDate() - 7);
-  return transactions.filter(transaction => transaction.date > threshold);
-});
-
-export const selectHasTransactions = createSelector(
-  selectTransactionItems,
-  transactions => transactions && transactions.length > 0
-);
-
-export const selectIsFetchingTransactions = createSelector(
-  selectState,
-  state => state.fetchingTransactions
-);
-
-export const selectIsSendingSupport = createSelector(selectState, state => state.sendingSupport);
-
-export const selectReceiveAddress = createSelector(selectState, state => state.receiveAddress);
-
-export const selectGettingNewAddress = createSelector(
-  selectState,
-  state => state.gettingNewAddress
-);
-
-export const selectBlocks = createSelector(selectState, state => state.blocks);
-
-export const makeSelectBlockDate = block =>
-  createSelector(
-    selectBlocks,
-    blocks => (blocks && blocks[block] ? new Date(blocks[block].time * 1000) : undefined)
-  );
diff --git a/src/renderer/rewards.js b/src/renderer/rewards.js
index 8d218c471..f55e26b45 100644
--- a/src/renderer/rewards.js
+++ b/src/renderer/rewards.js
@@ -1,6 +1,5 @@
-import Lbry from 'lbry';
+import { Lbry, doShowSnackBar } from 'lbry-redux';
 import Lbryio from 'lbryio';
-import { doShowSnackBar } from 'redux/actions/app';
 
 function rewardMessage(type, amount) {
   return {
diff --git a/src/renderer/scss/_gui.scss b/src/renderer/scss/_gui.scss
index 70e31aead..60d8c839f 100644
--- a/src/renderer/scss/_gui.scss
+++ b/src/renderer/scss/_gui.scss
@@ -86,7 +86,6 @@ input {
   &[type='file'] {
     border-bottom: none;
   }
-
   &.input-copyable {
     flex: 1;
     background: var(--input-copyable-bg);
@@ -95,7 +94,10 @@ input {
     border: 1px dashed var(--input-copyable-border);
   }
 
-  &:not(.input-copyable):not(.wunderbar__input):not(:placeholder-shown) {
+  &:not(.input-copyable):not(.wunderbar__input):not(:placeholder-shown):not(:disabled) {
+    &:hover {
+      border-color: var(--input-hover-border-color);
+    }
     border-bottom: var(--input-border-size) solid var(--input-border-color);
   }
 
@@ -106,7 +108,16 @@ input {
   }
 }
 
+textarea {
+  font-family: 'metropolis-medium';
+  border: 1px solid var(--color-divider);
+  font-size: 0.8em;
+  width: 100%;
+  padding: $spacing-vertical * 1/3;
+}
+
 input::placeholder {
+  color: var(--input-placeholder-color);
   opacity: 0.5;
 }
 
@@ -338,3 +349,9 @@ p {
   color: var(--color-meta-light);
   font-style: italic;
 }
+
+.qr-code {
+  &.qr-code--right-padding {
+    padding-right: $spacing-vertical * 2/3;
+  }
+}
diff --git a/src/renderer/scss/_vars.scss b/src/renderer/scss/_vars.scss
index 246104151..48d261b72 100644
--- a/src/renderer/scss/_vars.scss
+++ b/src/renderer/scss/_vars.scss
@@ -16,7 +16,7 @@ $large-breakpoint: 1760px;
   --video-aspect-ratio: 56.25%; // 9 x 16
   --snack-bar-width: 756px;
 
-  /* Colors */
+  /* Colors: Brand */
   --color-white: #fff;
   --color-black: #000;
   --color-grey: #d6d6d6;
@@ -34,28 +34,27 @@ $large-breakpoint: 1760px;
   --color-green: #399483;
   --color-green-light: #effbe4;
   --color-green-blue: #2ec1a8;
+
+  /* Colors */
   --color-divider: #e3e3e3;
-
-  --text-color: var(--color-black);
-  --text-color-inverse: var(--color-white);
-
-  --color-dark-overlay: rgba(32, 32, 32, 0.9);
   --color-help: rgba(0, 0, 0, 0.54);
   --color-error: #a94442;
   --color-download: var(--color-white);
   --color-download-overlay: var(--color-black);
   --color-bg: #fafafa;
   --color-bg-alt: var(--color-grey-light);
-  --color-placeholder: #ececec;
-  --color-nav-bg: var(--color-grey-light);
+  --color-placeholder: var(--color-grey);
+  --color-search-placeholder: var(--color-placeholder);
 
   /* Shadows */
-  --box-shadow-layer: 0 4px 9px -2px var(--color-grey);
+  --box-shadow-layer: transparent; // 0 2px 4px rgba(0,0,0,0.25);
   --box-shadow-button: 0 10px 20px rgba(0, 0, 0, 0.1);
-  --box-shadow-wunderbar: 0px 10px 20px rgba(0, 0, 0, 0.03);
+  --box-shadow-wunderbar: 0 10px 20px rgba(0, 0, 0, 0.03);
 
   /* Text */
-  --text-help-color: #eee;
+  --text-color: var(--color-black);
+  --text-color-inverse: var(--color-white);
+  --text-help-color: var(--color-help);
   --text-max-width: 660px;
   --text-link-padding: 4px;
   --text-selection-bg: rgba(saturate(lighten(#155b4a, 20%), 20%), 1); // temp color
@@ -70,7 +69,7 @@ $large-breakpoint: 1760px;
   --input-color: var(--text-color);
   --input-border-size: 1px;
   --input-border-color: var(--color-grey-dark);
-  --input-copyable-bg: var(--color-grey-light);
+  --input-copyable-bg: #f6f6f6;
   --input-copyable-color: var(--color-grey-dark);
   --input-copyable-border: var(--color-grey);
 
@@ -80,8 +79,9 @@ $large-breakpoint: 1760px;
 
   /* input:hover */
   --input-hover-border-color: rgba(0, 0, 0, 0.87);
+
   /* input:placeholder */
-  --input-placeholder-color: rgba(0, 0, 0, 0.42);
+  --input-placeholder-color: var(--color-help);
   --input-placeholder-opacity: 1;
 
   /* Select */
@@ -99,9 +99,14 @@ $large-breakpoint: 1760px;
   --btn-external-color: var(--color-light-blue);
   --btn-bg-secondary: var(--color-teal);
   --btn-bg-danger: var(--color-red);
+  --btn-home-bg-color: var(--color-white);
   --btn-radius: 20px;
   --btn-height: 36px;
 
+  /* SnackBar */
+  --snackbar-bg-primary: var(--color-primary);
+  --snackbar-color-primary: var(--text-color-inverse);
+
   /* Header */
   --header-bg: var(--color-white);
   --header-color: var(--color-text);
@@ -109,20 +114,30 @@ $large-breakpoint: 1760px;
   --header-height: $spacing-width * 3;
   --header-button-bg: transparent;
   --header-button-hover-bg: rgba(100, 100, 100, 0.15);
+  --header-primary-color: var(--color-primary);
 
   /* Header -> search */
   --search-color: #666;
   --search-bg-color: #fff;
+  --search-active-bg-color: var(--color-grey-light);
   --search-active-color: var(--header-active-color);
   --search-active-shadow: 0 6px 9px -2px var(--color-grey--dark);
+  --search-item-border-color: transparent;
+  --search-item-active-color: var(--color-black);
   --search-modal-input-height: 70px;
 
+  /* Nav */
+  --nav-color: var(--color-grey-dark);
+  --nav-bg-color: var(--color-grey-light);
+
   /* Table */
-  --table-border: 1px solid #e2e2e2;
-  --table-item-even: white;
-  --table-item-odd: #f4f4f4;
+  --table-border: 1px solid var(--color-grey-light);
+  --table-item-odd: var(--color-grey-light);
+  --table-item-even: transparent;
 
   /* Card */
+  --card-bg: var(--color-white);
+  --card-text-color: var(--color-grey-dark);
   --card-radius: 2px;
   --card-margin: $spacing-vertical * 2/3;
   --card-wallet-color: var(--text-color-inverse);
@@ -136,8 +151,10 @@ $large-breakpoint: 1760px;
   /* Modal */
   --modal-width: 440px;
   --modal-bg: var(--color-bg);
-  --modal-overlay-bg: rgba(#f5f5f5, 0.75); // --color-canvas: #F5F5F5
+  --modal-fullscreen-bg: var(--color-bg);
+  --modal-overlay-bg: rgba(246, 246, 246, 0.75);
   --modal-border: 1px solid rgb(204, 204, 204);
+  --modal-btn-bg-color: var(--btn-bg-alt);
 
   // /* Tooltip */
   --tooltip-width: 300px;
diff --git a/src/renderer/scss/component/_button.scss b/src/renderer/scss/component/_button.scss
index 2e0279647..6bc446ceb 100644
--- a/src/renderer/scss/component/_button.scss
+++ b/src/renderer/scss/component/_button.scss
@@ -135,6 +135,7 @@ button:disabled {
 */
 
 .btn.btn--home-nav {
+  background-color: var(--btn-home-bg-color);
   box-shadow: none;
 
   .btn__content {
@@ -145,6 +146,10 @@ button:disabled {
 .btn.btn--arrow {
   width: var(--btn-arrow-width);
 
+  &:hover:not(:disabled) {
+    color: var(--text-color);
+  }
+
   &:disabled {
     opacity: 0.3;
   }
@@ -158,9 +163,14 @@ button:disabled {
   }
 }
 
+.btn.btn--header-publish {
+  background-color: var(--header-primary-color);
+}
+
 .btn.btn--header-balance {
   font-family: 'metropolis-medium';
   font-size: 13px;
+  color: var(--header-primary-color);
 
   @media only screen and (min-width: $medium-breakpoint) {
     font-size: 18px;
@@ -171,15 +181,14 @@ button:disabled {
   }
 
   .btn__label--balance {
-    color: var(--color-grey-dark);
+    color: var(--text-help-color);
+    &:hover {
+      color: var(--text-color);
+    }
   }
 
   &:hover {
     background-color: transparent;
-
-    .btn__label--balance {
-      color: var(--btn-primary-bg);
-    }
   }
 }
 
@@ -188,6 +197,7 @@ button:disabled {
   color: var(--color-white);
   opacity: 0.8;
   border-radius: var(--btn-radius);
+  width: var(--btn-height);
   height: var(--btn-height);
   padding: 10px;
 }
diff --git a/src/renderer/scss/component/_card.scss b/src/renderer/scss/component/_card.scss
index eacc25491..d87bda3d4 100644
--- a/src/renderer/scss/component/_card.scss
+++ b/src/renderer/scss/component/_card.scss
@@ -10,9 +10,10 @@
 }
 
 .card--section {
-  background-color: var(--color-white);
+  background-color: var(--card-bg);
   padding: $spacing-vertical;
   margin-top: $spacing-vertical * 2/3;
+  box-shadow: var(--box-shadow-layer);
 }
 
 .card--small {
@@ -49,6 +50,7 @@
   color: var(--card-wallet-color);
   justify-content: space-between;
 
+  .card__title,
   .card__subtitle {
     color: var(--card-wallet-color);
   }
@@ -76,10 +78,13 @@
   background-color: var(--color-error);
 }
 
+.card__title-identity {
+  color: var(--text-color);
+}
+
 .card__title-identity--file {
   display: flex;
   align-items: center;
-
   .credit-amount,
   .icon {
     margin-top: $spacing-vertical * 1/3;
@@ -95,6 +100,7 @@
 
 .card__title {
   font-size: 18px;
+  color: var(--text-color);
 }
 
 .card__title--file {
@@ -116,9 +122,9 @@
 }
 
 .card__subtitle {
-  color: var(--color-help);
   font-size: 14px;
   font-family: 'metropolis-medium';
+  color: var(--card-text-color);
 
   .icon {
     margin-left: $spacing-vertical * 1/3;
@@ -175,7 +181,7 @@
 }
 
 .card__subtext-title {
-  color: var(--color-black);
+  color: var(--text-color);
   font-size: calc(var(--font-size-subtext-multiple) * 1.5em);
 
   &:not(:first-of-type) {
@@ -184,7 +190,6 @@
 }
 
 .card__subtext {
-  color: var(--color-grey-dark);
   font-size: calc(var(--font-size-subtext-multiple) * 1em);
   padding-top: $spacing-vertical * 1/3;
   word-break: break-word;
diff --git a/src/renderer/scss/component/_file-download.scss b/src/renderer/scss/component/_file-download.scss
index 642d6be7e..c4bd7e025 100644
--- a/src/renderer/scss/component/_file-download.scss
+++ b/src/renderer/scss/component/_file-download.scss
@@ -5,8 +5,11 @@
 
 .file-download {
   position: relative;
+  background-color: var(--color-black);
+  border-radius: var(--btn-radius);
   color: var(--color-download);
   font-size: 12px;
+  opacity: 0.8;
   font-family: 'metropolis-medium';
 }
 
diff --git a/src/renderer/scss/component/_form-field.scss b/src/renderer/scss/component/_form-field.scss
index efeec9d59..4c9950539 100644
--- a/src/renderer/scss/component/_form-field.scss
+++ b/src/renderer/scss/component/_form-field.scss
@@ -19,6 +19,10 @@
     align-items: center;
   }
 
+  &.form-row--stretch {
+    flex: 1;
+  }
+
   .form-field.form-field--stretch {
     width: 100%;
 
@@ -67,11 +71,11 @@
 }
 
 .form-field__label {
-  color: var(--color-black);
+  color: var(--form-label-color);
 }
 
 .form-field__help {
-  color: var(--color-grey-dark);
+  color: var(--color-help);
   padding-top: $spacing-vertical * 1/3;
 }
 
diff --git a/src/renderer/scss/component/_modal.scss b/src/renderer/scss/component/_modal.scss
index 5d58e46d7..ba6cee84b 100644
--- a/src/renderer/scss/component/_modal.scss
+++ b/src/renderer/scss/component/_modal.scss
@@ -22,7 +22,6 @@
   flex-direction: column;
   justify-content: center;
   align-items: center;
-
   border: var(--modal-border);
   background: var(--modal-bg);
   overflow: auto;
@@ -31,6 +30,11 @@
   box-shadow: var(--box-shadow-layer);
   max-width: var(--modal-width);
   word-break: break-word;
+
+  .btn.btn--alt {
+    // Set modal buttons bg color
+    background-color: var(--modal-btn-bg-color);
+  }
 }
 
 .modal--fullscreen {
@@ -40,7 +44,7 @@
   right: 0;
   bottom: 0;
   padding: $spacing-vertical;
-  background: var(--modal-bg);
+  background: var(--modal-fullscreen-bg);
   overflow-y: scroll;
 
   .main {
@@ -54,7 +58,7 @@
 // Slide down isn't possible without doing a lot of re-work to the modal component
 .ReactModal__Overlay {
   .modal--fullscreen {
-    transition: height var(--animation-style) var(--animation-style);
+    transition: height var(--animation-duration) var(--animation-style);
     height: 0;
   }
 
diff --git a/src/renderer/scss/component/_nav.scss b/src/renderer/scss/component/_nav.scss
index 54c432142..ae6d28f80 100644
--- a/src/renderer/scss/component/_nav.scss
+++ b/src/renderer/scss/component/_nav.scss
@@ -1,13 +1,14 @@
 .nav {
   grid-area: nav;
-  background-color: var(--color-nav-bg);
+  background-color: var(--nav-bg-color);
   padding: $spacing-width;
+  color: var(--nav-color);
 
   hr {
     width: 24px;
     margin: 36px 0;
     // width: 40px;
-    border: solid 1px var(--color-grey);
+    border: solid 1px var(--color-divider);
     margin: $spacing-vertical $spacing-vertical * 2/3;
   }
 }
@@ -28,7 +29,7 @@
 
 .nav__link {
   // padding-top: $spacing-vertical / 3;
-  color: var(--color-grey-dark);
+  color: inherit;
   white-space: nowrap;
 
   .btn__label {
@@ -48,7 +49,7 @@
   }
 
   .btn:hover {
-    color: var(--color-black);
+    color: var(--text-color);
   }
 }
 
@@ -70,10 +71,11 @@
 }
 
 .nav__link--active {
-  color: var(--color-black);
+  color: var(--text-color);
 }
 
 .nav__sub-links {
+  color: var(--nav-color);
   padding-bottom: $spacing-vertical * 1/3;
 }
 
diff --git a/src/renderer/scss/component/_scrollbar.scss b/src/renderer/scss/component/_scrollbar.scss
index c501d0ddd..bec95304f 100644
--- a/src/renderer/scss/component/_scrollbar.scss
+++ b/src/renderer/scss/component/_scrollbar.scss
@@ -1,5 +1,6 @@
 ::-webkit-scrollbar {
   width: 8px;
+  height: 8px;
   overflow: auto;
 }
 
diff --git a/src/renderer/scss/component/_search.scss b/src/renderer/scss/component/_search.scss
index b172f67a4..ba95dfdf0 100644
--- a/src/renderer/scss/component/_search.scss
+++ b/src/renderer/scss/component/_search.scss
@@ -31,21 +31,24 @@
   border-bottom: none;
 
   &:focus {
-    background-color: var(--color-bg);
+    background-color: var(--search-active-bg-color);
     border-radius: 0;
-    border-bottom: 1px solid var(--color-grey);
+    border-bottom: 1px solid var(--color-divider);
     box-shadow: var(--box-shadow-button);
   }
 }
 
 .wunderbar__menu {
   max-width: 100px;
+  border-radius: 0 0 3px 3px !important;
+  padding: 0 !important;
+  background: transparent !important;
   overflow-x: hidden;
 }
 
 .wunderbar__suggestion {
   padding: 5px 10px;
-  background-color: var(--header-bg);
+  background-color: var(--search-bg-color);
   cursor: pointer;
   display: flex;
   align-items: center;
@@ -53,7 +56,7 @@
   font-family: 'metropolis-medium';
 
   &:not(:first-of-type) {
-    border-top: 1px solid var(--color-divider);
+    border-top: 1px solid var(--search-item-border-color);
   }
 }
 
@@ -69,6 +72,7 @@
 }
 
 .wunderbar__active-suggestion {
+  color: var(--search-item-active-color);
   background-color: var(--color-secondary);
 }
 
@@ -80,10 +84,9 @@
 
 .search__input {
   font-family: 'metropolis-bold';
-  background: var(--color-black);
   font-size: var(--search-modal-input-height);
-  color: var(--color-black);
-  background: var(--modal-bg);
+  color: var(--search-color);
+  background: transparent;
   width: 100%;
 }
 
@@ -93,5 +96,8 @@
 
   .search-result__column {
     flex: 0 0 270px;
+    .card__media {
+      background-color: var(--color-search-placeholder);
+    }
   }
 }
diff --git a/src/renderer/scss/component/_snack-bar.scss b/src/renderer/scss/component/_snack-bar.scss
index 3ded1d68a..6135f1cc1 100644
--- a/src/renderer/scss/component/_snack-bar.scss
+++ b/src/renderer/scss/component/_snack-bar.scss
@@ -1,30 +1,51 @@
 .snack-bar {
-  padding: $spacing-vertical;
-  position: fixed;
-  top: $spacing-vertical;
-  left: 0;
-  right: 0;
-  margin-left: auto;
-  margin-right: auto;
-  min-width: 300px;
-  max-width: var(--snack-bar-width);
-  background: var(--color-dark-overlay);
-  color: #f0f0f0;
+  background-color: var(--snackbar-bg-primary);
+  border-radius: 10px;
+  box-shadow: var(--box-shadow-layer);
+  color: var(--snackbar-color-primary);
   display: flex;
   justify-content: space-between;
-  align-items: center;
-  border-radius: 2px;
+  left: 0;
+  margin-left: auto;
+  margin-right: auto;
+  max-width: var(--snack-bar-width);
+  min-width: 300px;
+  opacity: 0.95;
+  padding: 14px 20px 10px 20px;
+  position: fixed;
+  right: 0;
+  top: $spacing-vertical;
   transition: all var(--transition-duration) var(--transition-type);
+  width: 100%;
   z-index: 10000; /*hack to get it over react modal */
 }
 
 .snack-bar__action {
   display: inline-block;
-  text-transform: uppercase;
-  color: var(--color-primary-light);
-  margin: 0px 0px 0px $spacing-vertical;
+  margin-bottom: 4px;
   min-width: min-content;
-  &:hover {
-    text-decoration: underline;
+  text-transform: uppercase;
+
+  span {
+    &:hover {
+      text-decoration: underline;
+    }
+  }
+}
+
+.snack-bar__message {
+  align-items: center;
+  display: flex;
+  flex-direction: row;
+
+  div {
+    &:nth-of-type(1) {
+      font-size: 30px;
+      margin-right: 20px;
+    }
+    &:nth-of-type(2) {
+      font-size: 16px;
+      margin-bottom: 4px;
+    }
   }
 }
diff --git a/src/renderer/scss/component/_table.scss b/src/renderer/scss/component/_table.scss
index c5df4f48e..109922e1a 100644
--- a/src/renderer/scss/component/_table.scss
+++ b/src/renderer/scss/component/_table.scss
@@ -15,12 +15,14 @@ table.table {
   }
 
   thead {
-    border-bottom: 1px solid var(--color-grey);
+    color: var(--text-color);
+    border-bottom: var(--table-border);
   }
 
   th,
   td {
     font-size: 13px;
+    padding: 8px 0;
   }
 
   th {
@@ -29,7 +31,7 @@ table.table {
 
   td {
     font-family: 'metropolis-medium';
-    color: var(--color-grey-dark);
+    color: var(--color-help);
     padding: $spacing-vertical * 1/6 0;
 
     .btn:not(.btn--link) {
@@ -48,6 +50,8 @@ table.table {
 
   tbody {
     tr {
+      border-bottom: var(--table-item-border);
+      padding: 8px 0;
       &:nth-child(even):not(.odd) {
         background-color: var(--table-item-odd);
       }
@@ -70,7 +74,7 @@ table.table--stretch {
 
 table.table--help {
   td:nth-of-type(1) {
-    color: var(--color-black);
+    color: var(--text-color);
     font-family: 'metropolis-semibold';
     min-width: 130px;
   }
diff --git a/src/renderer/store.js b/src/renderer/store.js
index 7e4ef6835..425b3acd4 100644
--- a/src/renderer/store.js
+++ b/src/renderer/store.js
@@ -1,16 +1,18 @@
 import { createLogger } from 'redux-logger';
 import appReducer from 'redux/reducers/app';
 import availabilityReducer from 'redux/reducers/availability';
-import claimsReducer from 'redux/reducers/claims';
 import contentReducer from 'redux/reducers/content';
-import costInfoReducer from 'redux/reducers/cost_info';
-import fileInfoReducer from 'redux/reducers/file_info';
+import {
+  claimsReducer,
+  costInfoReducer,
+  fileInfoReducer,
+  searchReducer,
+  walletReducer,
+} from 'lbry-redux';
 import navigationReducer from 'redux/reducers/navigation';
 import rewardsReducer from 'redux/reducers/rewards';
-import searchReducer from 'redux/reducers/search';
 import settingsReducer from 'redux/reducers/settings';
 import userReducer from 'redux/reducers/user';
-import walletReducer from 'redux/reducers/wallet';
 import shapeShiftReducer from 'redux/reducers/shape_shift';
 import subscriptionsReducer from 'redux/reducers/subscriptions';
 import mediaReducer from 'redux/reducers/media';
@@ -96,12 +98,14 @@ const store = createStore(
 const compressor = createCompressor();
 const saveClaimsFilter = createFilter('claims', ['byId', 'claimsByUri']);
 const subscriptionsFilter = createFilter('subscriptions', ['subscriptions']);
+// We only need to persist the receiveAddress for the wallet
+const walletFilter = createFilter('wallet', ['receiveAddress']);
 
 const persistOptions = {
-  whitelist: ['claims', 'subscriptions', 'publish'],
+  whitelist: ['claims', 'subscriptions', 'publish', 'wallet'],
   // Order is important. Needs to be compressed last or other transforms can't
   // read the data
-  transforms: [saveClaimsFilter, subscriptionsFilter, compressor],
+  transforms: [saveClaimsFilter, subscriptionsFilter, walletFilter, compressor],
   debounce: 10000,
   storage: localForage,
 };
diff --git a/src/renderer/util/batchActions.js b/src/renderer/util/batchActions.js
deleted file mode 100644
index 4bc4eee7f..000000000
--- a/src/renderer/util/batchActions.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// https://github.com/reactjs/redux/issues/911
-function batchActions(...actions) {
-  return {
-    type: 'BATCH_ACTIONS',
-    actions,
-  };
-}
-
-export default batchActions;
diff --git a/src/renderer/util/form-validation.js b/src/renderer/util/form-validation.js
index 161e628d6..167e6c0b2 100644
--- a/src/renderer/util/form-validation.js
+++ b/src/renderer/util/form-validation.js
@@ -1,6 +1,6 @@
 // @flow
 /* eslint-disable prefer-default-export */
-import { regexAddress } from 'lbryURI';
+import { regexAddress } from 'lbry-redux';
 
 type DraftTxValues = {
   address: string,
diff --git a/static/themes/dark.css b/static/themes/dark.css
index abb09ed39..00185a9df 100644
--- a/static/themes/dark.css
+++ b/static/themes/dark.css
@@ -1,65 +1,91 @@
 :root {
-    /* Colors */
-    --color-primary:  #009688;
-    --color-canvas: #0f1517;
-    --color-bg: #1a2327;
-    --color-bg-alt: #314048;
-    --color-help: rgba(255,255,255, 0.5);
-    --color-error: #a94442;
-    --color-load-screen-text: #FFF;
-    --color-money: #1DE9B6;
-    --color-meta-light: #757575;
-    --color-dark-overlay: rgba(15, 21, 23, 0.85);
-    --color-download: rgba(255, 255, 255, 0.75);
 
+  /* Colors */
 
-    /* Text */
-    --text-color: #FFF;
-    --text-selection-bg: rgba(0,150,136, 0.95);
+  --color-divider: #53637C;;
+  --color-canvas: transparent;
+  --color-help: #8696AF;
+  --color-download: rgba(255, 255, 255, 0.75);
+  --color-download-overlay: var(--color-black);
+  --color-bg: #203049;
+  --color-bg-alt: #13233C;
+  --color-placeholder: var(--color-bg-alt);
 
-    /* Form */
-    --form-label-color: rgba(255, 255, 255, 0.70);
+  /* Text */
+  --text-color: #FFF;
+  --text-help-color: var(--color-help);
+  --text-selection-color: #fff;
 
-    /* Input */
-    --input-bg: transparent;
-    --input-border-color: rgba(255,255,255, 0.70);
-    --input-hover-border-color: rgba(255, 255, 255, 1);
+   /* Form */
+   --form-label-color: #FFF;
 
-    /* input:placeholder */
-    --input-placeholder-color: rgba(255,255,255, 0.5);
+  /* Input */
+  --input-bg: transparent;
+  --input-label-color: var(--color-help);
+  --input-color: var(--text-color);
+  --input-border-size: 1px;
+  --input-border-color: rgba(255,255,255, 0.5);
+  --input-hover-border-color: rgba(255, 255, 255, 1);
+  --input-copyable-bg: #203049;
+  --input-copyable-color: #8696AF;
+  --input-copyable-border: #53637C;
 
-    /* input:disabled */
-    --input-disabled-color: rgba(255, 255, 255, 0.50);
-    --input-disabled-border-color: rgba(255, 255, 255, 0.70);
+  /* input:disabled */
+  --input-disabled-border-color: rgba(255, 255, 255, 0.42);
+  --input-disabled-color: rgba(255, 255, 255, 0.54);
 
-    /* Search */
-    --search-bg: rgba(0,0,0, 0.45);
-    --search-color: #757575;
-    --search-active-bg: rgba(0,0,0, 0.75);
-    --search-border: 1px solid rgba(0,0,0, 0.25);
+  /* Button */
+  --btn-bg-primary: var(--color-primary);
+  --btn-color-primary: var(--color-white);
+  --btn-bg-primary-hover: var(--color-primary-light);
+  --btn-bg-alt: #13233C;
+  --btn-color-alt: var(--text-color);
+  --btn-home-bg-color: #44548F;
 
-    /* Tab */
-    --tab-color: rgba(255,255,255, 0.5) ;
-    --tab-active-color: rgba(255,255,255, 0.75);
+  /* Header */
+  --header-bg: var(--color-white);
+  --header-color: var(--color-text);
+  --header-active-color: rgba(0, 0, 0, 0.85);
+  --header-button-bg: transparent;
+  --header-button-hover-bg: rgba(100, 100, 100, 0.15);
+  --header-primary-color: #8165B0;
 
-    /* Header */
-    --header-color: #CCC;
-    --header-active-color: #FFF;
-    --header-button-hover-bg: var(--color-bg-alt);
+  /* Header */
+  --header-color: #CCC;
+  --header-active-color: var(--color-white);
+  --header-button-hover-bg: var(--color-bg-alt);
 
-    /* Table */
-    --table-border: 0;
-    --table-item-even: var(--color-bg-alt);
-    --table-item-odd: transparent;
+  /* Header -> search */
+  --search-color: var(--color-white);
+  --search-bg-color: rgb(58, 74, 99);
+  --search-active-bg-color: #13233C;
+  --search-active-shadow: 0 6px 9px -2px var(--color-grey--dark);
+  --search-modal-input-height: 70px;
 
-    /* Modal */
-    --modal-overlay-bg: var(--color-dark-overlay);
-    --modal-border: 1px solid rgba(0, 0, 0, 0.25);
+  /* Nav */
+  --nav-color: #44548F;
+  --nav-bg-color: #0D102F;
 
-    /* Scrollbar */
-    --scrollbar-thumb-bg: rgba(255, 255, 255, 0.20);
-    --scrollbar-thumb-hover-bg: rgba(255, 255, 255, 0.35);
+  /* Table */
+  --table-border: 1px solid var(--color-bg-alt);
+  --table-item-odd: var(--color-bg-alt);
 
-    /* Divider */
-    --divider: 1px solid rgba(255, 225, 225, 0.12);
+  /* Card */
+  --card-bg: #13233C;
+  --card-radius: 3px;
+  --card-text-color: var(--color-help);
+  --card-wallet-color: var(--text-color-inverse);
+  --success-msg-color: var(--color-primary-light);
+  --success-msg-border:var(--color-primary);
+  --success-msg-bg: var(--color-bg);
+
+  /* Modal */
+  --modal-bg: var(--card-bg);
+  --modal-overlay-bg:  rgba(32,48,73, 0.75);
+  --modal-border: 1px solid rgba(0, 0, 0, 0.25);
+  --modal-btn-bg-color: #2D3D56;
+
+  /* Scrollbar */
+  --scrollbar-thumb-bg: rgba(255, 255, 255, 0.20);
+  --scrollbar-thumb-hover-bg: #8696AF;
 }
diff --git a/yarn.lock b/yarn.lock
index 2119fff2c..7b59ded10 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -26,35 +26,35 @@
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz#9cafb171af82329490353b4816f03347aa150a30"
 
-"@babel/code-frame@7.0.0-beta.42", "@babel/code-frame@^7.0.0-beta.35", "@babel/code-frame@^7.0.0-beta.40":
-  version "7.0.0-beta.42"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.42.tgz#a9c83233fa7cd06b39dc77adbb908616ff4f1962"
+"@babel/code-frame@7.0.0-beta.44", "@babel/code-frame@^7.0.0-beta.35":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
   dependencies:
-    "@babel/highlight" "7.0.0-beta.42"
+    "@babel/highlight" "7.0.0-beta.44"
 
-"@babel/generator@7.0.0-beta.42":
-  version "7.0.0-beta.42"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.42.tgz#777bb50f39c94a7e57f73202d833141f8159af33"
+"@babel/generator@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42"
   dependencies:
-    "@babel/types" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.44"
     jsesc "^2.5.1"
     lodash "^4.2.0"
     source-map "^0.5.0"
     trim-right "^1.0.1"
 
-"@babel/helper-function-name@7.0.0-beta.42":
-  version "7.0.0-beta.42"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.42.tgz#b38b8f4f85168d1812c543dd700b5d549b0c4658"
+"@babel/helper-function-name@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.44.tgz#e18552aaae2231100a6e485e03854bc3532d44dd"
   dependencies:
-    "@babel/helper-get-function-arity" "7.0.0-beta.42"
-    "@babel/template" "7.0.0-beta.42"
-    "@babel/types" "7.0.0-beta.42"
+    "@babel/helper-get-function-arity" "7.0.0-beta.44"
+    "@babel/template" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
 
-"@babel/helper-get-function-arity@7.0.0-beta.42":
-  version "7.0.0-beta.42"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.42.tgz#ad072e32f912c033053fc80478169aeadc22191e"
+"@babel/helper-get-function-arity@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.44.tgz#d03ca6dd2b9f7b0b1e6b32c56c72836140db3a15"
   dependencies:
-    "@babel/types" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.44"
 
 "@babel/helper-module-imports@7.0.0-beta.35":
   version "7.0.0-beta.35"
@@ -63,39 +63,39 @@
     "@babel/types" "7.0.0-beta.35"
     lodash "^4.2.0"
 
-"@babel/helper-split-export-declaration@7.0.0-beta.42":
-  version "7.0.0-beta.42"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.42.tgz#0d0d5254220a9cc4e7e226240306b939dc210ee7"
+"@babel/helper-split-export-declaration@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.44.tgz#c0b351735e0fbcb3822c8ad8db4e583b05ebd9dc"
   dependencies:
-    "@babel/types" "7.0.0-beta.42"
+    "@babel/types" "7.0.0-beta.44"
 
-"@babel/highlight@7.0.0-beta.42":
-  version "7.0.0-beta.42"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.42.tgz#a502a1c0d6f99b2b0e81d468a1b0c0e81e3f3623"
+"@babel/highlight@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
   dependencies:
     chalk "^2.0.0"
     esutils "^2.0.2"
     js-tokens "^3.0.0"
 
-"@babel/template@7.0.0-beta.42":
-  version "7.0.0-beta.42"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.42.tgz#7186d4e70d44cdec975049ba0a73bdaf5cdee052"
+"@babel/template@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.42"
-    "@babel/types" "7.0.0-beta.42"
-    babylon "7.0.0-beta.42"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     lodash "^4.2.0"
 
-"@babel/traverse@^7.0.0-beta.40":
-  version "7.0.0-beta.42"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.42.tgz#f4bf4d1e33d41baf45205e2d0463591d57326285"
+"@babel/traverse@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.0.0-beta.44.tgz#a970a2c45477ad18017e2e465a0606feee0d2966"
   dependencies:
-    "@babel/code-frame" "7.0.0-beta.42"
-    "@babel/generator" "7.0.0-beta.42"
-    "@babel/helper-function-name" "7.0.0-beta.42"
-    "@babel/helper-split-export-declaration" "7.0.0-beta.42"
-    "@babel/types" "7.0.0-beta.42"
-    babylon "7.0.0-beta.42"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/generator" "7.0.0-beta.44"
+    "@babel/helper-function-name" "7.0.0-beta.44"
+    "@babel/helper-split-export-declaration" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     debug "^3.1.0"
     globals "^11.1.0"
     invariant "^2.2.0"
@@ -109,21 +109,35 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@babel/types@7.0.0-beta.42", "@babel/types@^7.0.0-beta.40":
-  version "7.0.0-beta.42"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.42.tgz#1e2118767684880f6963801b272fd2b3348efacc"
+"@babel/types@7.0.0-beta.44":
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.0.0-beta.44.tgz#6b1b164591f77dec0a0342aca995f2d046b3a757"
   dependencies:
     esutils "^2.0.2"
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
+"@segment/top-domain@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@segment/top-domain/-/top-domain-3.0.0.tgz#02e5a5a4fd42a9f6cf886b05e82f104012a3c3a7"
+  dependencies:
+    component-cookie "^1.1.2"
+    component-url "^0.2.1"
+
 "@types/node@^8.0.24":
-  version "8.10.1"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.1.tgz#aac98b810c50568054486f2bb8c486d824713be8"
+  version "8.10.8"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.8.tgz#794cba23cc9f8d9715f6543fa8827433b5f5cd3b"
 
 "@types/webpack-env@^1.13.5":
-  version "1.13.5"
-  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.5.tgz#ca854e9fbdbcdf45d7376882875f28e2c60593f8"
+  version "1.13.6"
+  resolved "https://registry.yarnpkg.com/@types/webpack-env/-/webpack-env-1.13.6.tgz#128d1685a7c34d31ed17010fc87d6a12c1de6976"
+
+JSONStream@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea"
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
 
 abab@^1.0.4:
   version "1.0.4"
@@ -199,12 +213,13 @@ ajv@^5.0.0, ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0:
     json-schema-traverse "^0.3.0"
 
 ajv@^6.0.1, ajv@^6.1.0, ajv@^6.1.1:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.3.0.tgz#1650a41114ef00574cac10b8032d8f4c14812da7"
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.4.0.tgz#d3aff78e9277549771daf0164cff48482b754fc6"
   dependencies:
     fast-deep-equal "^1.0.0"
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
+    uri-js "^3.0.2"
 
 align-text@^0.1.1, align-text@^0.1.3:
   version "0.1.4"
@@ -222,6 +237,16 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
+amplitude-js@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/amplitude-js/-/amplitude-js-4.1.1.tgz#f9aa4dbbab431df3ec132e07b7e1d5ca773e4068"
+  dependencies:
+    "@segment/top-domain" "^3.0.0"
+    blueimp-md5 "^2.10.0"
+    json3 "^3.3.2"
+    lodash "^4.17.4"
+    ua-parser-js "github:amplitude/ua-parser-js#ed538f1"
+
 ansi-align@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-2.0.0.tgz#c36aeccba563b89ceb556f3690f0b1d9e3547f7f"
@@ -233,8 +258,8 @@ ansi-escapes@^1.0.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
 
 ansi-escapes@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.0.0.tgz#ec3e8b4e9f8064fc02c3ac9b65f1c275bda8ef92"
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
 
 ansi-html@0.0.7:
   version "0.0.7"
@@ -273,10 +298,6 @@ app-builder-bin-linux@1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.7.2.tgz#a764c8e52ecf1b5b068f32c820c6daf1ffed6a8f"
 
-app-builder-bin-linux@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.1.tgz#10e9d344ff8019dbc708e11eca13db91f36607e2"
-
 app-builder-bin-linux@1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/app-builder-bin-linux/-/app-builder-bin-linux-1.8.3.tgz#4bf638a7bd29365e5534d2ba554baf1350fb4a87"
@@ -289,10 +310,6 @@ app-builder-bin-mac@1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.7.2.tgz#c4ee0d950666c97c12a45ac74ec6396be3357644"
 
-app-builder-bin-mac@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.1.tgz#0f3d8ddb3b502cadeebc6db24593a74cd87138d0"
-
 app-builder-bin-mac@1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/app-builder-bin-mac/-/app-builder-bin-mac-1.8.3.tgz#8e2c63e9d822fce2eee8db2f9f817d7b68532df7"
@@ -305,10 +322,6 @@ app-builder-bin-win@1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.7.2.tgz#7acac890782f4118f09941b343ba06c56452a6f6"
 
-app-builder-bin-win@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.1.tgz#866ebd5f724143b8f55d365f88c22e221425fa1d"
-
 app-builder-bin-win@1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/app-builder-bin-win/-/app-builder-bin-win-1.8.3.tgz#3598ec1c523dd197e8bb5dfeab3e2fe70905ae79"
@@ -325,14 +338,6 @@ app-builder-bin@1.7.2:
     app-builder-bin-mac "1.7.2"
     app-builder-bin-win "1.7.2"
 
-app-builder-bin@1.8.1:
-  version "1.8.1"
-  resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.1.tgz#12c795c5203e59c6927816b2429b340667f634e8"
-  optionalDependencies:
-    app-builder-bin-linux "1.8.1"
-    app-builder-bin-mac "1.8.1"
-    app-builder-bin-win "1.8.1"
-
 app-builder-bin@1.8.3:
   version "1.8.3"
   resolved "https://registry.yarnpkg.com/app-builder-bin/-/app-builder-bin-1.8.3.tgz#902174b5864521e5068fe1d8ae5566633a5b9c44"
@@ -521,8 +526,8 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
 
 atob@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/atob/-/atob-2.0.3.tgz#19c7a760473774468f20b2d2d03372ad7d4cbf5d"
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.0.tgz#ab2b150e51d7b122b9efc8d7340c06b6c41076bc"
 
 autoprefixer@^6.3.1:
   version "6.7.7"
@@ -536,8 +541,8 @@ autoprefixer@^6.3.1:
     postcss-value-parser "^3.2.3"
 
 aws-sdk@^2.214.1:
-  version "2.216.1"
-  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.216.1.tgz#9dbf964206d722240507cc60d46e8d3bae9c34f0"
+  version "2.224.1"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.224.1.tgz#82fe93e10b3e818f315c35ce8667cdc8db94a0b3"
   dependencies:
     buffer "4.9.1"
     events "1.1.1"
@@ -559,8 +564,8 @@ aws-sign2@~0.7.0:
   resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"
 
 aws4@^1.2.1, aws4@^1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e"
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289"
 
 axios@^0.18.0:
   version "0.18.0"
@@ -608,13 +613,13 @@ babel-core@^6.26.0:
     source-map "^0.5.6"
 
 babel-eslint@^8.2.2:
-  version "8.2.2"
-  resolved "http://registry.npmjs.org/babel-eslint/-/babel-eslint-8.2.2.tgz#1102273354c6f0b29b4ea28a65f97d122296b68b"
+  version "8.2.3"
+  resolved "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-8.2.3.tgz#1a2e6681cc9bc4473c32899e59915e19cd6733cf"
   dependencies:
-    "@babel/code-frame" "^7.0.0-beta.40"
-    "@babel/traverse" "^7.0.0-beta.40"
-    "@babel/types" "^7.0.0-beta.40"
-    babylon "^7.0.0-beta.40"
+    "@babel/code-frame" "7.0.0-beta.44"
+    "@babel/traverse" "7.0.0-beta.44"
+    "@babel/types" "7.0.0-beta.44"
+    babylon "7.0.0-beta.44"
     eslint-scope "~3.7.1"
     eslint-visitor-keys "^1.0.0"
 
@@ -1237,9 +1242,9 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0:
     lodash "^4.17.4"
     to-fast-properties "^1.0.3"
 
-babylon@7.0.0-beta.42, babylon@^7.0.0-beta.40:
-  version "7.0.0-beta.42"
-  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.42.tgz#67cfabcd4f3ec82999d29031ccdea89d0ba99657"
+babylon@7.0.0-beta.44:
+  version "7.0.0-beta.44"
+  resolved "https://registry.yarnpkg.com/babylon/-/babylon-7.0.0-beta.44.tgz#89159e15e6e30c5096e22d738d8c0af8a0e8ca1d"
 
 babylon@^6.18.0:
   version "6.18.0"
@@ -1254,8 +1259,8 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
 
 base62@^1.1.0:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/base62/-/base62-1.2.7.tgz#5c01aad73c0124f9535cff1bdb9c4e6ccf838cfb"
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/base62/-/base62-1.2.8.tgz#1264cb0fb848d875792877479dbe8bae6bae3428"
 
 base64-js@0.0.8:
   version "0.0.8"
@@ -1266,8 +1271,8 @@ base64-js@1.2.0:
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1"
 
 base64-js@^1.0.2, base64-js@^1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
 
 base@^0.11.1:
   version "0.11.2"
@@ -1292,8 +1297,8 @@ bcrypt-pbkdf@^1.0.0:
     tweetnacl "^0.14.3"
 
 big-integer@^1.6.17:
-  version "1.6.27"
-  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.27.tgz#8e56c6f8b2dd6c4fe8d32102b83d4f25868e4b3a"
+  version "1.6.28"
+  resolved "https://registry.yarnpkg.com/big-integer/-/big-integer-1.6.28.tgz#8cef0fda3ccde8759c2c66efcfacc35aea658283"
 
 big.js@^3.1.3:
   version "3.2.0"
@@ -1341,6 +1346,10 @@ bluebird@~3.4.1:
   version "3.4.7"
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.4.7.tgz#f72d760be09b7f76d08ed8fae98b289a8d05fab3"
 
+blueimp-md5@^2.10.0:
+  version "2.10.0"
+  resolved "https://registry.yarnpkg.com/blueimp-md5/-/blueimp-md5-2.10.0.tgz#02f0843921f90dca14f5b8920a38593201d6964d"
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -1421,16 +1430,14 @@ braces@^1.8.2:
     repeat-element "^1.1.2"
 
 braces@^2.3.0, braces@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb"
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
   dependencies:
     arr-flatten "^1.1.0"
     array-unique "^0.3.2"
-    define-property "^1.0.0"
     extend-shallow "^2.0.1"
     fill-range "^4.0.0"
     isobject "^3.0.1"
-    kind-of "^6.0.2"
     repeat-element "^1.1.2"
     snapdragon "^0.8.1"
     snapdragon-node "^2.0.1"
@@ -1452,8 +1459,8 @@ browser-resolve@^1.11.2:
     resolve "1.1.7"
 
 browserify-aes@^1.0.0, browserify-aes@^1.0.4:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.1.1.tgz#38b7ab55edb806ff2dcda1a7f1620773a477c49f"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48"
   dependencies:
     buffer-xor "^1.0.3"
     cipher-base "^1.0.0"
@@ -1463,16 +1470,16 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4:
     safe-buffer "^5.0.1"
 
 browserify-cipher@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0"
   dependencies:
     browserify-aes "^1.0.4"
     browserify-des "^1.0.0"
     evp_bytestokey "^1.0.0"
 
 browserify-des@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.1.tgz#3343124db6d7ad53e26a8826318712bdc8450f9c"
   dependencies:
     cipher-base "^1.0.1"
     des.js "^1.0.0"
@@ -1533,8 +1540,8 @@ buffer-crc32@~0.2.3:
   resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"
 
 buffer-fill@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.0.tgz#ca9470e8d4d1b977fd7543f4e2ab6a7dc95101a8"
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-0.1.1.tgz#76d825c4d6e50e06b7a31eb520c04d08cc235071"
 
 buffer-from@^1.0.0:
   version "1.0.0"
@@ -1632,26 +1639,7 @@ builder-util@5.7.4:
     stat-mode "^0.2.2"
     temp-file "^3.1.1"
 
-builder-util@^5.6.7, builder-util@^5.7.0:
-  version "5.7.2"
-  resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.7.2.tgz#049b4365993f34519c9d56589494cda2257b24d3"
-  dependencies:
-    "7zip-bin" "~3.1.0"
-    app-builder-bin "1.8.1"
-    bluebird-lst "^1.0.5"
-    builder-util-runtime "^4.2.0"
-    chalk "^2.3.2"
-    debug "^3.1.0"
-    fs-extra-p "^4.5.2"
-    is-ci "^1.1.0"
-    js-yaml "^3.11.0"
-    lazy-val "^1.0.3"
-    semver "^5.5.0"
-    source-map-support "^0.5.4"
-    stat-mode "^0.2.2"
-    temp-file "^3.1.1"
-
-builder-util@^5.7.4:
+builder-util@^5.6.7, builder-util@^5.7.0, builder-util@^5.7.4:
   version "5.7.5"
   resolved "https://registry.yarnpkg.com/builder-util/-/builder-util-5.7.5.tgz#58f8d2b7a35445c5fb45bff50b39bbed554c9863"
   dependencies:
@@ -1670,7 +1658,7 @@ builder-util@^5.7.4:
     stat-mode "^0.2.2"
     temp-file "^3.1.1"
 
-builtin-modules@^1.0.0, builtin-modules@^1.1.1:
+builtin-modules@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f"
 
@@ -1768,12 +1756,12 @@ caniuse-api@^1.5.2:
     lodash.uniq "^4.5.0"
 
 caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000819"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000819.tgz#c3b7dd559e5e6d63d5dcaa62bac6bd04c7619709"
+  version "1.0.30000830"
+  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000830.tgz#6e45255b345649fd15ff59072da1e12bb3de2f13"
 
 caniuse-lite@^1.0.30000792:
-  version "1.0.30000819"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000819.tgz#aabee5fd15a080febab6ae5d30c9ea15f4c6d4e2"
+  version "1.0.30000830"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000830.tgz#cb96b8a2dd3cbfe04acea2af3c4e894249095328"
 
 capture-stack-trace@^1.0.0:
   version "1.0.0"
@@ -1815,8 +1803,8 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     supports-color "^2.0.0"
 
 chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.1, chalk@^2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.0.tgz#a060a297a6b57e15b61ca63ce84995daa0fe6e52"
   dependencies:
     ansi-styles "^3.2.1"
     escape-string-regexp "^1.0.5"
@@ -2045,7 +2033,7 @@ combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@2.15.x, commander@^2.11.0, commander@^2.14.1, commander@^2.5.0, commander@^2.9.0, commander@~2.15.0:
+commander@2.15.x, commander@^2.11.0, commander@^2.12.2, commander@^2.14.1, commander@^2.5.0, commander@^2.9.0, commander@~2.15.0:
   version "2.15.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f"
 
@@ -2098,10 +2086,20 @@ compare-version@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/compare-version/-/compare-version-0.1.2.tgz#0162ec2d9351f5ddd59a9202cba935366a725080"
 
+component-cookie@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/component-cookie/-/component-cookie-1.1.3.tgz#053e14a3bd7748154f55724fd39a60c01994ebed"
+  dependencies:
+    debug "*"
+
 component-emitter@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6"
 
+component-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/component-url/-/component-url-0.2.1.tgz#4e4f4799c43ead9fd3ce91b5a305d220208fee47"
+
 compressible@~2.0.13:
   version "2.0.13"
   resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9"
@@ -2142,8 +2140,8 @@ concat-stream@^1.5.0, concat-stream@^1.6.0:
     typedarray "^0.0.6"
 
 configstore@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90"
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f"
   dependencies:
     dot-prop "^4.1.0"
     graceful-fs "^4.1.2"
@@ -2178,10 +2176,6 @@ content-disposition@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
 
-content-type-parser@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/content-type-parser/-/content-type-parser-1.0.2.tgz#caabe80623e63638b2502fd4c7f12ff4ce2352e7"
-
 content-type@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
@@ -2218,8 +2212,8 @@ core-js@^1.0.0:
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636"
 
 core-js@^2.4.0, core-js@^2.5.0:
-  version "2.5.3"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.3.tgz#8acc38345824f16d8365b7c9b4259168e8ed603e"
+  version "2.5.5"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.5.tgz#b14dde936c640c0579a6b50cabcc132dd6127e3b"
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -2242,8 +2236,8 @@ country-data@^0.0.31:
     underscore ">1.4.4"
 
 create-ecdh@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.1.tgz#44223dfed533193ba5ba54e0df5709b89acf1f82"
   dependencies:
     bn.js "^4.1.0"
     elliptic "^6.0.0"
@@ -2255,17 +2249,18 @@ create-error-class@^3.0.0:
     capture-stack-trace "^1.0.0"
 
 create-hash@^1.1.0, create-hash@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd"
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196"
   dependencies:
     cipher-base "^1.0.1"
     inherits "^2.0.1"
-    ripemd160 "^2.0.0"
+    md5.js "^1.3.4"
+    ripemd160 "^2.0.1"
     sha.js "^2.4.0"
 
 create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06"
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff"
   dependencies:
     cipher-base "^1.0.3"
     create-hash "^1.1.0"
@@ -2340,8 +2335,8 @@ css-color-names@0.0.4:
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
 
 css-hot-loader@^1.3.7:
-  version "1.3.8"
-  resolved "https://registry.yarnpkg.com/css-hot-loader/-/css-hot-loader-1.3.8.tgz#edc17f9a24c8e2254c1c570e3779257489aa53f6"
+  version "1.3.9"
+  resolved "https://registry.yarnpkg.com/css-hot-loader/-/css-hot-loader-1.3.9.tgz#ed22b41126920134a4a2246d7d32113e2425c754"
   dependencies:
     loader-utils "^1.1.0"
     lodash "^4.17.5"
@@ -2475,6 +2470,14 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
+data-urls@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/data-urls/-/data-urls-1.0.0.tgz#24802de4e81c298ea8a9388bb0d8e461c774684f"
+  dependencies:
+    abab "^1.0.4"
+    whatwg-mimetype "^2.0.0"
+    whatwg-url "^6.4.0"
+
 date-fns@^1.27.2:
   version "1.29.0"
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.29.0.tgz#12e609cdcb935127311d04d33334e2960a2a54e6"
@@ -2483,15 +2486,15 @@ date-now@^0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b"
 
-debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
-  version "2.6.9"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+debug@*, debug@^3.0.0, debug@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261"
+debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.6.6, debug@^2.6.8, debug@^2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   dependencies:
     ms "2.0.0"
 
@@ -2691,8 +2694,8 @@ diff@^3.2.0:
   resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
 
 diffie-hellman@^5.0.0:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e"
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875"
   dependencies:
     bn.js "^4.1.0"
     miller-rabin "^4.0.0"
@@ -2846,11 +2849,7 @@ ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
 
-ejs@^2.5.7:
-  version "2.5.7"
-  resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.7.tgz#cc872c168880ae3c7189762fd5ffc00896c9518a"
-
-ejs@^2.5.8:
+ejs@^2.5.7, ejs@^2.5.8:
   version "2.5.8"
   resolved "https://registry.yarnpkg.com/ejs/-/ejs-2.5.8.tgz#2ab6954619f225e6193b7ac5f7c39c48fefe4380"
 
@@ -2940,7 +2939,7 @@ electron-devtools-installer@^2.2.3:
     rimraf "^2.5.2"
     semver "^5.3.0"
 
-electron-dl@^1.11.0:
+electron-dl@^1.11.0, electron-dl@^1.6.0:
   version "1.11.0"
   resolved "https://registry.yarnpkg.com/electron-dl/-/electron-dl-1.11.0.tgz#112851f3857bb1a556b5c736af06040bd40df850"
   dependencies:
@@ -3031,8 +3030,8 @@ electron-publisher-s3@^20.8.1:
     mime "^2.2.0"
 
 electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
-  version "1.3.40"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf"
+  version "1.3.42"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9"
 
 electron-updater@^2.21.4:
   version "2.21.4"
@@ -3209,8 +3208,8 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es5-ext@^0.10.14, es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.41"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.41.tgz#bab3e982d750f0112f0cb9e6abed72c59eb33eb2"
+  version "0.10.42"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d"
   dependencies:
     es6-iterator "~2.0.3"
     es6-symbol "~3.1.1"
@@ -3235,10 +3234,16 @@ es6-map@^0.1.3:
     es6-symbol "~3.1.1"
     event-emitter "~0.3.5"
 
-es6-promise@^4.0.5:
+es6-promise@^4.0.3, es6-promise@^4.0.5:
   version "4.2.4"
   resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29"
 
+es6-promisify@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-5.0.0.tgz#5109d62f3e56ea967c4b63505aef08291c8a5203"
+  dependencies:
+    es6-promise "^4.0.3"
+
 es6-set@~0.1.5:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1"
@@ -3349,16 +3354,15 @@ eslint-module-utils@^2.2.0:
     pkg-dir "^1.0.0"
 
 eslint-plugin-flowtype@^2.46.1:
-  version "2.46.1"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.46.1.tgz#c4f81d580cd89c82bc3a85a1ccf4ae3a915143a4"
+  version "2.46.2"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-2.46.2.tgz#8749fddda6f6c30d0672011151bea726765b5753"
   dependencies:
     lodash "^4.15.0"
 
 eslint-plugin-import@^2.10.0:
-  version "2.10.0"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.10.0.tgz#fa09083d5a75288df9c6c7d09fe12255985655e7"
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.11.0.tgz#15aeea37a67499d848e8e981806d4627b5503816"
   dependencies:
-    builtin-modules "^1.1.1"
     contains-path "^0.1.0"
     debug "^2.6.8"
     doctrine "1.5.0"
@@ -3368,6 +3372,7 @@ eslint-plugin-import@^2.10.0:
     lodash "^4.17.4"
     minimatch "^3.0.3"
     read-pkg-up "^2.0.0"
+    resolve "^1.6.0"
 
 eslint-plugin-jsx-a11y@^6.0.3:
   version "6.0.3"
@@ -3479,8 +3484,8 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
 
 esquery@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.0.tgz#cfba8b57d7fba93f17298a8a006a04cda13d80fa"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
   dependencies:
     estraverse "^4.0.0"
 
@@ -3679,8 +3684,8 @@ extend@~3.0.0, extend@~3.0.1:
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.1.tgz#a755ea7bc1adfcc5a31ce7e762dbaadc5e636444"
 
 external-editor@^2.0.4:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.1.0.tgz#3d026a21b7f95b5726387d4200ac160d372c3b48"
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-2.2.0.tgz#045511cfd8d133f3846673d1047c154e214ad3d5"
   dependencies:
     chardet "^0.4.0"
     iconv-lite "^0.4.17"
@@ -3731,6 +3736,10 @@ extsprintf@^1.2.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
 
+eyes@^0.1.8:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0"
+
 fast-deep-equal@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
@@ -3885,8 +3894,8 @@ find-parent-dir@^0.3.0:
   resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
 
 find-process@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/find-process/-/find-process-1.1.0.tgz#f21fa08220fec972b471d92ae3cf0c62bebcd5bb"
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/find-process/-/find-process-1.1.1.tgz#57fb1adbc7f4304786db720a49febd708a3162d4"
   dependencies:
     chalk "^2.0.1"
     commander "^2.11.0"
@@ -3930,7 +3939,11 @@ flow-babel-webpack-plugin@^1.1.1:
     flow-bin ">=0.44.2 <1"
     lodash.merge "^4.6.0"
 
-"flow-bin@>=0.44.2 <1", flow-bin@^0.69.0:
+"flow-bin@>=0.44.2 <1":
+  version "0.70.0"
+  resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.70.0.tgz#080ae83a997f2b4ddb3dc2649bf13336825292b5"
+
+flow-bin@^0.69.0:
   version "0.69.0"
   resolved "https://registry.yarnpkg.com/flow-bin/-/flow-bin-0.69.0.tgz#053159a684a6051fcbf0b71a2eb19a9679082da6"
 
@@ -4039,7 +4052,7 @@ fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
 
-from2@^2.1.0:
+from2@^2.1.0, from2@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
   dependencies:
@@ -4278,8 +4291,8 @@ global@~4.3.0:
     process "~0.5.1"
 
 globals@^11.0.1, globals@^11.1.0:
-  version "11.3.0"
-  resolved "https://registry.yarnpkg.com/globals/-/globals-11.3.0.tgz#e04fdb7b9796d8adac9c8f64c14837b2313378b0"
+  version "11.4.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-11.4.0.tgz#b85c793349561c16076a3c13549238a27945f1bc"
 
 globals@^9.18.0:
   version "9.18.0"
@@ -4576,14 +4589,13 @@ html-loader@^0.5.5:
     object-assign "^4.1.1"
 
 html-minifier@^3.2.3, html-minifier@^3.5.8:
-  version "3.5.12"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.12.tgz#6bfad4d0327f5b8d2b62f5854654ac3703b9b031"
+  version "3.5.15"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.15.tgz#f869848d4543cbfd84f26d5514a2a87cbf9a05e0"
   dependencies:
     camel-case "3.0.x"
     clean-css "4.1.x"
     commander "2.15.x"
     he "1.1.x"
-    ncname "1.0.x"
     param-case "2.1.x"
     relateurl "0.2.x"
     uglify-js "3.3.x"
@@ -4612,7 +4624,7 @@ http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
 
-http-errors@1.6.2, http-errors@~1.6.2:
+http-errors@1.6.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.2.tgz#0a002cc85707192a7e7946ceedc11155f60ec736"
   dependencies:
@@ -4621,6 +4633,15 @@ http-errors@1.6.2, http-errors@~1.6.2:
     setprototypeof "1.0.3"
     statuses ">= 1.3.1 < 2"
 
+http-errors@~1.6.2:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.3"
+    setprototypeof "1.1.0"
+    statuses ">= 1.4.0 < 2"
+
 http-parser-js@>=0.4.0:
   version "0.4.11"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.11.tgz#5b720849c650903c27e521633d94696ee95f3529"
@@ -4682,10 +4703,16 @@ i18n-extract@^0.5.1:
     gettext-parser "^1.2.0"
     glob "^7.1.1"
 
-iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@^0.4.19, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
+iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
 
+iconv-lite@^0.4.17, iconv-lite@^0.4.19, iconv-lite@^0.4.5, iconv-lite@~0.4.13:
+  version "0.4.21"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.21.tgz#c47f8733d02171189ebc4a400f3218d348094798"
+  dependencies:
+    safer-buffer "^2.1.0"
+
 icss-replace-symbols@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
@@ -4701,8 +4728,8 @@ ieee754@1.1.8:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4"
 
 ieee754@^1.1.4:
-  version "1.1.10"
-  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.10.tgz#719a6f7b026831e64bdb838b0de1bb0029bbf716"
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455"
 
 iferr@^0.1.5:
   version "0.1.5"
@@ -4791,6 +4818,10 @@ inquirer@^3.0.6:
     strip-ansi "^4.0.0"
     through "^2.3.6"
 
+install@^0.10.2:
+  version "0.10.4"
+  resolved "https://registry.yarnpkg.com/install/-/install-0.10.4.tgz#9cb09115768b93a582d1450a6ba3f275975b49aa"
+
 internal-ip@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-1.2.0.tgz#ae9fbf93b984878785d50a8de1b356956058cf5c"
@@ -5201,6 +5232,17 @@ isurl@^1.0.0-alpha5:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
+jayson@^2.0.2:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/jayson/-/jayson-2.0.5.tgz#46df3f0bceb0b5b708bf7c8806c34c81938d3f21"
+  dependencies:
+    JSONStream "^1.3.1"
+    commander "^2.12.2"
+    es6-promisify "^5.0.0"
+    eyes "^0.1.8"
+    json-stringify-safe "^5.0.1"
+    lodash "^4.17.4"
+
 jest-config@^22.4.3:
   version "22.4.3"
   resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.3.tgz#0e9d57db267839ea31309119b41dc2fa31b76403"
@@ -5362,17 +5404,16 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
 
 jsdom@^11.5.1:
-  version "11.6.2"
-  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.6.2.tgz#25d1ef332d48adf77fc5221fe2619967923f16bb"
+  version "11.8.0"
+  resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-11.8.0.tgz#a52e9a7d2b931284f62c80dad5f17d7390499d8b"
   dependencies:
     abab "^1.0.4"
     acorn "^5.3.0"
     acorn-globals "^4.1.0"
     array-equal "^1.0.0"
-    browser-process-hrtime "^0.1.2"
-    content-type-parser "^1.0.2"
     cssom ">= 0.3.2 < 0.4.0"
     cssstyle ">= 0.2.37 < 0.3.0"
+    data-urls "^1.0.0"
     domexception "^1.0.0"
     escodegen "^1.9.0"
     html-encoding-sniffer "^1.0.2"
@@ -5388,6 +5429,7 @@ jsdom@^11.5.1:
     w3c-hr-time "^1.0.1"
     webidl-conversions "^4.0.2"
     whatwg-encoding "^1.0.3"
+    whatwg-mimetype "^2.1.0"
     whatwg-url "^6.4.0"
     ws "^4.0.0"
     xml-name-validator "^3.0.0"
@@ -5404,13 +5446,17 @@ jsesc@~0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
 
+jshashes@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/jshashes/-/jshashes-1.0.7.tgz#bed8c97a0e9632fd0513916f55f76dd5486be59f"
+
 json-loader@^0.5.4:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
 
 json-parse-better-errors@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.1.tgz#50183cd1b2d25275de069e9e71b467ac9eab973a"
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
 
 json-schema-traverse@^0.3.0:
   version "0.3.1"
@@ -5458,6 +5504,10 @@ jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
 
+jsonparse@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+
 jsonpointer@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/jsonpointer/-/jsonpointer-4.0.1.tgz#4fd92cb34e0e9db3c89c8622ecf51f9b978c6cb9"
@@ -5538,6 +5588,33 @@ lazy-val@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/lazy-val/-/lazy-val-1.0.3.tgz#bb97b200ef00801d94c317e29dc6ed39e31c5edc"
 
+lbry-redux@lbryio/lbry-redux:
+  version "0.0.1"
+  resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/800083dc244191e5f2385ba8df11b85ca5fec8eb"
+  dependencies:
+    amplitude-js "^4.0.0"
+    bluebird "^3.5.1"
+    classnames "^2.2.5"
+    electron-dl "^1.6.0"
+    from2 "^2.3.0"
+    install "^0.10.2"
+    jayson "^2.0.2"
+    jshashes "^1.0.7"
+    proxy-polyfill "0.1.6"
+    rc-progress "^2.0.6"
+    react "^16.2.0"
+    react-redux "^5.0.3"
+    redux "^3.6.0"
+    redux-action-buffer "^1.1.0"
+    redux-logger "^3.0.1"
+    redux-persist "^4.8.0"
+    redux-persist-transform-compress "^4.2.0"
+    redux-persist-transform-filter "0.0.10"
+    reselect "^3.0.0"
+    semver "^5.3.0"
+    tree-kill "^1.1.0"
+    y18n "^4.0.0"
+
 lcid@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lcid/-/lcid-1.0.0.tgz#308accafa0bc483a3867b4b6f2b9506251d1b835"
@@ -5545,8 +5622,8 @@ lcid@^1.0.0:
     invert-kv "^1.0.0"
 
 left-pad@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e"
 
 leven@^2.1.0:
   version "2.1.0"
@@ -5566,8 +5643,8 @@ lie@3.1.1:
     immediate "~3.0.5"
 
 lint-staged@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.0.2.tgz#c99f6800e0525fa9c16f04c13ebe137edfd4fcd7"
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/lint-staged/-/lint-staged-7.0.4.tgz#1aa7f27427e4c4c85d4d6524ac98aac10cbaf1b8"
   dependencies:
     app-root-path "^2.0.1"
     chalk "^2.3.1"
@@ -5589,6 +5666,7 @@ lint-staged@^7.0.2:
     pify "^3.0.0"
     please-upgrade-node "^3.0.1"
     staged-git-files "1.1.1"
+    string-argv "^0.0.2"
     stringify-object "^3.2.2"
 
 listenercount@~1.0.1:
@@ -5697,8 +5775,8 @@ locate-path@^2.0.0:
     path-exists "^3.0.0"
 
 lodash-es@^4.17.4, lodash-es@^4.17.5, lodash-es@^4.2.1:
-  version "4.17.7"
-  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.7.tgz#db240a3252c3dd8360201ac9feef91ac977ea856"
+  version "4.17.8"
+  resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.8.tgz#6fa8c8c5d337481df0bdf1c0d899d42473121e45"
 
 lodash.assign@^4.0.3, lodash.assign@^4.0.6, lodash.assign@^4.2.0:
   version "4.2.0"
@@ -5817,8 +5895,8 @@ lower-case@^1.1.1:
   resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"
 
 lowercase-keys@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
 
 lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.2"
@@ -5863,8 +5941,8 @@ map-visit@^1.0.0:
     object-visit "^1.0.0"
 
 marked@*:
-  version "0.3.18"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.18.tgz#3ef058cd926101849b92a7a7c15db18c7fc76b2f"
+  version "0.3.19"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
 
 math-expression-evaluator@^1.2.14:
   version "1.2.17"
@@ -6003,8 +6081,8 @@ mime@^1.2.11, mime@^1.4.1, mime@^1.5.0:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
 
 mime@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.2.0.tgz#161e541965551d3b549fa1114391e3a3d55b923b"
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
 
 mimic-fn@^1.0.0:
   version "1.2.0"
@@ -6021,8 +6099,8 @@ min-document@^2.19.0:
     dom-walk "^0.1.0"
 
 minimalistic-assert@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3"
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
 
 minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1:
   version "1.0.1"
@@ -6072,8 +6150,8 @@ mixin-object@^2.0.1:
     is-extendable "^0.1.1"
 
 mixpanel-browser@^2.17.1:
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/mixpanel-browser/-/mixpanel-browser-2.19.0.tgz#425a5c29f621b2050d2aa4ee121b73a4ccd6c3aa"
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/mixpanel-browser/-/mixpanel-browser-2.20.0.tgz#07cc666b3c7c95ac35b302a0fbc787b71921e595"
 
 mkdirp@0.5.0:
   version "0.5.0"
@@ -6092,8 +6170,8 @@ modify-filename@^1.1.0:
   resolved "https://registry.yarnpkg.com/modify-filename/-/modify-filename-1.1.0.tgz#9a2dec83806fbb2d975f22beec859ca26b393aa1"
 
 moment@^2.22.0:
-  version "2.22.0"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730"
+  version "2.22.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
 
 move-concurrently@^1.0.1:
   version "1.0.1"
@@ -6154,7 +6232,7 @@ nan@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
 
-nan@^2.3.0, nan@^2.3.2:
+nan@^2.10.0, nan@^2.3.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f"
 
@@ -6179,19 +6257,13 @@ natural-compare@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
 
-ncname@1.0.x:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ncname/-/ncname-1.0.0.tgz#5b57ad18b1ca092864ef62b0b1ed8194f383b71c"
-  dependencies:
-    xml-char-classes "^1.0.0"
-
 negotiator@0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
 
 neo-async@^2.5.0:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.1.tgz#acb909e327b1e87ec9ef15f41b8a269512ad41ee"
 
 next-event@^1.0.0:
   version "1.0.0"
@@ -6300,8 +6372,8 @@ node-pre-gyp@^0.6.39:
     tar-pack "^3.4.0"
 
 node-sass@^4.7.2:
-  version "4.7.2"
-  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.7.2.tgz#9366778ba1469eb01438a9e8592f4262bcb6794e"
+  version "4.8.3"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.8.3.tgz#d077cc20a08ac06f661ca44fb6f19cd2ed41debb"
   dependencies:
     async-foreach "^0.1.3"
     chalk "^1.1.1"
@@ -6315,7 +6387,7 @@ node-sass@^4.7.2:
     lodash.mergewith "^4.6.0"
     meow "^3.7.0"
     mkdirp "^0.5.1"
-    nan "^2.3.2"
+    nan "^2.10.0"
     node-gyp "^3.3.1"
     npmlog "^4.0.0"
     request "~2.79.0"
@@ -6635,8 +6707,8 @@ param-case@2.1.x:
     no-case "^2.2.0"
 
 parse-asn1@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712"
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
   dependencies:
     asn1.js "^4.0.0"
     browserify-aes "^1.0.0"
@@ -7088,8 +7160,8 @@ postcss@^6.0.1:
     supports-color "^5.3.0"
 
 prebuild-install@^2.4.1:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.1.tgz#0f234140a73760813657c413cdccdda58296b1da"
+  version "2.5.3"
+  resolved "https://registry.yarnpkg.com/prebuild-install/-/prebuild-install-2.5.3.tgz#9f65f242782d370296353710e9bc843490c19f69"
   dependencies:
     detect-libc "^1.0.3"
     expand-template "^1.0.2"
@@ -7120,8 +7192,8 @@ preserve@^0.2.0:
   resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
 
 prettier@^1.11.1:
-  version "1.11.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.11.1.tgz#61e43fc4cd44e68f2b0dfc2c38cd4bb0fccdcc75"
+  version "1.12.1"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325"
 
 pretty-bytes@^1.0.2:
   version "1.0.4"
@@ -7200,6 +7272,10 @@ proxy-addr@~2.0.3:
     forwarded "~0.1.2"
     ipaddr.js "1.6.0"
 
+proxy-polyfill@0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/proxy-polyfill/-/proxy-polyfill-0.1.6.tgz#ef41ec6c66f534db15db36c54493a62d184b364e"
+
 prr@~1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476"
@@ -7209,8 +7285,8 @@ pseudomap@^1.0.2:
   resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3"
 
 public-encrypt@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6"
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994"
   dependencies:
     bn.js "^4.1.0"
     browserify-rsa "^4.0.0"
@@ -7363,8 +7439,8 @@ rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7, rc@^1.2.1:
     strip-json-comments "~2.0.1"
 
 react-dom@^16.3.0:
-  version "16.3.0"
-  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.0.tgz#b318e52184188ecb5c3e81117420cca40618643e"
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.3.2.tgz#cb90f107e09536d683d84ed5d4888e9640e0e4df"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -7372,8 +7448,12 @@ react-dom@^16.3.0:
     prop-types "^15.6.0"
 
 react-feather@^1.0.8:
-  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/react-feather/-/react-feather-1.0.8.tgz#69b13d5c729949f194d33201dee91bab67fa31a2"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/react-feather/-/react-feather-1.1.0.tgz#f0aa692497de952237ca1f3b118ebcb5427152e1"
+
+react-lifecycles-compat@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.2.tgz#7279047275bd727a912e25f734c0559527e84eff"
 
 react-markdown@^2.5.0:
   version "2.5.1"
@@ -7384,11 +7464,12 @@ react-markdown@^2.5.0:
     prop-types "^15.5.1"
 
 react-modal@^3.1.7:
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.3.2.tgz#b13da9490653a7c76bc0e9600323eb1079c620e7"
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/react-modal/-/react-modal-3.4.1.tgz#9bee876ffb1b077447abef9aa298d375625f8ecf"
   dependencies:
     exenv "^1.2.0"
     prop-types "^15.5.10"
+    react-lifecycles-compat "^3.0.0"
     warning "^3.0.0"
 
 react-paginate@^5.2.1:
@@ -7408,7 +7489,7 @@ react-redux@^5.0.3:
     loose-envify "^1.1.0"
     prop-types "^15.6.0"
 
-react-simplemde-editor@^3.6.11:
+react-simplemde-editor@3.6.11:
   version "3.6.11"
   resolved "https://registry.yarnpkg.com/react-simplemde-editor/-/react-simplemde-editor-3.6.11.tgz#4b9e136f6d4d00218e8ece3d87949e23b14e21dc"
   dependencies:
@@ -7432,9 +7513,9 @@ react@^0.14.2:
     envify "^3.0.0"
     fbjs "^0.6.1"
 
-react@^16.3.0:
-  version "16.3.0"
-  resolved "https://registry.yarnpkg.com/react/-/react-16.3.0.tgz#fc5a01c68f91e9b38e92cf83f7b795ebdca8ddff"
+react@^16.2.0, react@^16.3.0:
+  version "16.3.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-16.3.2.tgz#fdc8420398533a1e58872f59091b272ce2f91ea9"
   dependencies:
     fbjs "^0.8.16"
     loose-envify "^1.1.0"
@@ -7486,15 +7567,15 @@ read-pkg@^2.0.0:
     path-type "^2.0.0"
 
 "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.3, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.2.9, readable-stream@^2.3.3, readable-stream@^2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.5.tgz#b4f85003a938cbb6ecbce2a124fb1012bd1a838d"
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   dependencies:
     core-util-is "~1.0.0"
     inherits "~2.0.3"
     isarray "~1.0.0"
     process-nextick-args "~2.0.0"
     safe-buffer "~5.1.1"
-    string_decoder "~1.0.3"
+    string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
 readable-stream@1.0:
@@ -7566,6 +7647,10 @@ reduce-function-call@^1.0.1:
   dependencies:
     balanced-match "^0.4.2"
 
+redux-action-buffer@^1.1.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/redux-action-buffer/-/redux-action-buffer-1.2.0.tgz#2ec0a1d899cc9f6f44ccdeb431ee52ad41dd9755"
+
 redux-logger@^3.0.1:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/redux-logger/-/redux-logger-3.0.6.tgz#f7555966f3098f3c88604c449cf0baf5778274bf"
@@ -7579,6 +7664,17 @@ redux-persist-transform-compress@^4.2.0:
     json-stringify-safe "^5.0.1"
     lz-string "^1.4.4"
 
+redux-persist-transform-filter@0.0.10:
+  version "0.0.10"
+  resolved "https://registry.yarnpkg.com/redux-persist-transform-filter/-/redux-persist-transform-filter-0.0.10.tgz#9a3b106ce8939d2cbbf5212c747ed177fff14280"
+  dependencies:
+    lodash.forin "^4.4.0"
+    lodash.get "^4.4.2"
+    lodash.isempty "^4.4.0"
+    lodash.pickby "^4.6.0"
+    lodash.set "^4.3.2"
+    lodash.unset "^4.5.2"
+
 redux-persist-transform-filter@0.0.16:
   version "0.0.16"
   resolved "https://registry.yarnpkg.com/redux-persist-transform-filter/-/redux-persist-transform-filter-0.0.16.tgz#0c21dc166774c12fb3f090f7a2f5ea90f7ba0cea"
@@ -7645,8 +7741,8 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     safe-regex "^1.1.0"
 
 regexpp@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.0.1.tgz#d857c3a741dce075c2848dcb019a0a975b190d43"
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-1.1.0.tgz#0e3516dd0b7904f413d2d4193dce4618c3a689ab"
 
 regexpu-core@^1.0.0:
   version "1.0.0"
@@ -7827,8 +7923,8 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
 
 require-from-string@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.1.tgz#c545233e9d7da6616e9d59adfb39fc9f588676ff"
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
 
 require-main-filename@^1.0.1:
   version "1.0.1"
@@ -7871,9 +7967,9 @@ resolve@1.1.7:
   version "1.1.7"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
 
-resolve@^1.4.0, resolve@^1.5.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c"
+resolve@^1.4.0, resolve@^1.5.0, resolve@^1.6.0:
+  version "1.7.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3"
   dependencies:
     path-parse "^1.0.5"
 
@@ -7937,8 +8033,8 @@ rx-lite@*, rx-lite@^4.0.8:
   resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444"
 
 rxjs@^5.4.2:
-  version "5.5.7"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.7.tgz#afb3d1642b069b2fbf203903d6501d1acb4cda27"
+  version "5.5.10"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045"
   dependencies:
     symbol-observable "1.0.1"
 
@@ -7952,6 +8048,10 @@ safe-regex@^1.1.0:
   dependencies:
     ret "~0.1.10"
 
+safer-buffer@^2.1.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+
 sanitize-filename@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/sanitize-filename/-/sanitize-filename-1.6.1.tgz#612da1c96473fa02dccda92dcd5b4ab164a6772a"
@@ -8054,8 +8154,8 @@ send@0.16.2:
     statuses "~1.4.0"
 
 serialize-javascript@^1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.4.0.tgz#7c958514db6ac2443a8abc062dc9f7886a7f6005"
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
 
 serve-index@^1.7.2:
   version "1.9.1"
@@ -8407,7 +8507,11 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.3.1 < 2", statuses@~1.4.0:
+"statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+
+statuses@~1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
 
@@ -8471,6 +8575,10 @@ strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
 
+string-argv@^0.0.2:
+  version "0.0.2"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.0.2.tgz#dac30408690c21f3c3630a3ff3a05877bdcbd736"
+
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
@@ -8490,9 +8598,9 @@ string.prototype.repeat@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/string.prototype.repeat/-/string.prototype.repeat-0.2.0.tgz#aba36de08dcee6a5a337d49b2ea1da1b28fc0ecf"
 
-string_decoder@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.0.tgz#384f322ee8a848e500effde99901bba849c5d403"
+string_decoder@^1.0.0, string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
   dependencies:
     safe-buffer "~5.1.0"
 
@@ -8500,12 +8608,6 @@ string_decoder@~0.10.x:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
 
-string_decoder@~1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
-  dependencies:
-    safe-buffer "~5.1.0"
-
 stringify-object@^3.2.2:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/stringify-object/-/stringify-object-3.2.2.tgz#9853052e5a88fb605a44cd27445aa257ad7ffbcd"
@@ -8601,8 +8703,8 @@ supports-color@^4.2.1:
     has-flag "^2.0.0"
 
 supports-color@^5.1.0, supports-color@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0"
+  version "5.4.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54"
   dependencies:
     has-flag "^3.0.0"
 
@@ -8740,7 +8842,7 @@ through2@~0.2.3:
     readable-stream "~1.1.9"
     xtend "~2.1.1"
 
-through@^2.3.6, through@^2.3.8, through@~2.3.4, through@~2.3.6:
+"through@>=2.2.7 <3", through@^2.3.6, through@^2.3.8, through@~2.3.4, through@~2.3.6:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
 
@@ -8757,8 +8859,8 @@ timed-out@^4.0.0:
   resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
 
 timers-browserify@^2.0.4:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.6.tgz#241e76927d9ca05f4d959819022f5b3664b64bae"
+  version "2.0.9"
+  resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-2.0.9.tgz#3dea6faaab8038589dc6d0c4ccbc08b02698bab3"
   dependencies:
     setimmediate "^1.0.4"
 
@@ -8893,6 +8995,10 @@ ua-parser-js@^0.7.9:
   version "0.7.17"
   resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.17.tgz#e9ec5f9498b9ec910e7ae3ac626a805c4d09ecac"
 
+"ua-parser-js@github:amplitude/ua-parser-js#ed538f1":
+  version "0.7.10"
+  resolved "https://codeload.github.com/amplitude/ua-parser-js/tar.gz/ed538f16f5c6ecd8357da989b617d4f156dcf35d"
+
 uglify-es@^3.3.4:
   version "3.3.9"
   resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
@@ -8901,8 +9007,8 @@ uglify-es@^3.3.4:
     source-map "~0.6.1"
 
 uglify-js@3.3.x:
-  version "3.3.16"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.16.tgz#23ba13efa27aa00885be7417819e8a9787f94028"
+  version "3.3.21"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.21.tgz#851a34cbb31840ecb881968ed07dd3a61e7264a0"
   dependencies:
     commander "~2.15.0"
     source-map "~0.6.1"
@@ -9032,8 +9138,8 @@ unzip-response@^2.0.1:
   resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-2.0.1.tgz#d2f0f737d16b0615e72a6935ed04214572d56f97"
 
 unzipper@^0.8.11:
-  version "0.8.11"
-  resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.11.tgz#894383dc6b4bdab944e446f665a82d40d167fbd4"
+  version "0.8.13"
+  resolved "https://registry.yarnpkg.com/unzipper/-/unzipper-0.8.13.tgz#ea889ca10cdda4dcf604e632f19fc5f81871beae"
   dependencies:
     big-integer "^1.6.17"
     binary "~0.3.0"
@@ -9050,8 +9156,8 @@ upath@^1.0.0:
   resolved "https://registry.yarnpkg.com/upath/-/upath-1.0.4.tgz#ee2321ba0a786c50973db043a50b7bcba822361d"
 
 update-notifier@^2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.4.0.tgz#f9b4c700fbfd4ec12c811587258777d563d8c866"
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"
   dependencies:
     boxen "^1.2.1"
     chalk "^2.0.1"
@@ -9068,6 +9174,12 @@ upper-case@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598"
 
+uri-js@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-3.0.2.tgz#f90b858507f81dea4dcfbb3c4c3dbfa2b557faaa"
+  dependencies:
+    punycode "^2.1.0"
+
 urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
@@ -9094,8 +9206,8 @@ url-parse@1.0.x:
     requires-port "1.0.x"
 
 url-parse@^1.1.8:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.2.0.tgz#3a19e8aaa6d023ddd27dcc44cb4fc8f7fec23986"
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.3.0.tgz#04a06c420d22beb9804f7ada2d57ad13160a4258"
   dependencies:
     querystringify "~1.0.0"
     requires-port "~1.0.0"
@@ -9235,8 +9347,8 @@ webidl-conversions@^4.0.1, webidl-conversions@^4.0.2:
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
 
 webpack-build-notifier@^0.1.23:
-  version "0.1.23"
-  resolved "https://registry.yarnpkg.com/webpack-build-notifier/-/webpack-build-notifier-0.1.23.tgz#7df405dfb77c5584c4e2e27b445f6aa0414ca384"
+  version "0.1.24"
+  resolved "https://registry.yarnpkg.com/webpack-build-notifier/-/webpack-build-notifier-0.1.24.tgz#d0006fde12691bb4b1cb920910d4e70087544a6d"
   dependencies:
     ansi-regex "^2.0.0"
     node-notifier "5.1.2"
@@ -9342,13 +9454,17 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.3:
     iconv-lite "0.4.19"
 
 whatwg-fetch@>=0.10.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz#9c84ec2dcf68187ff00bc64e1274b442176e1c84"
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
 
 whatwg-fetch@^0.9.0:
   version "0.9.0"
   resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-0.9.0.tgz#0e3684c6cb9995b43efc9df03e4c365d95fd9cc0"
 
+whatwg-mimetype@^2.0.0, whatwg-mimetype@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.1.0.tgz#f0f21d76cbba72362eb609dbed2a30cd17fcc7d4"
+
 whatwg-url@^6.4.0:
   version "6.4.0"
   resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.4.0.tgz#08fdf2b9e872783a7a1f6216260a1d66cc722e08"
@@ -9458,10 +9574,6 @@ xhr@^2.0.1:
     parse-headers "^2.0.0"
     xtend "^4.0.0"
 
-xml-char-classes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/xml-char-classes/-/xml-char-classes-1.0.0.tgz#64657848a20ffc5df583a42ad8a277b4512bbc4d"
-
 xml-name-validator@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"