diff --git a/app/.testcafe-electron-rc b/app/.testcafe-electron-rc
deleted file mode 100644
index 708ef19..0000000
--- a/app/.testcafe-electron-rc
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "mainWindowUrl": "./app.html",
-  "appPath": "."
-}
diff --git a/app/Routes.js b/app/Routes.js
index f0cd297..96e6929 100644
--- a/app/Routes.js
+++ b/app/Routes.js
@@ -7,7 +7,7 @@ import ReactModal from 'react-modal';
 import { Switch, Route } from 'react-router';
 import native from '../native/index.node';
 import { ErrorModal, ErrorModalData } from './components/ErrorModal';
-import cstyles from './components/Common.css';
+import cstyles from './components/Common.module.css';
 import routes from './constants/routes.json';
 import App from './containers/App';
 import Dashboard from './components/Dashboard';
diff --git a/app/components/Addressbook.js b/app/components/Addressbook.js
index af7e49c..4b4218f 100644
--- a/app/components/Addressbook.js
+++ b/app/components/Addressbook.js
@@ -8,8 +8,8 @@ import {
   AccordionItemPanel,
   Accordion
 } from 'react-accessible-accordion';
-import styles from './Addressbook.css';
-import cstyles from './Common.css';
+import styles from './Addressbook.module.css';
+import cstyles from './Common.module.css';
 import { AddressBookEntry } from './AppState';
 import ScrollPane from './ScrollPane';
 import Utils from '../utils/utils';
diff --git a/app/components/Addressbook.css b/app/components/Addressbook.module.css
similarity index 100%
rename from app/components/Addressbook.css
rename to app/components/Addressbook.module.css
diff --git a/app/components/BalanceBlocks.js b/app/components/BalanceBlocks.js
index 36215bf..a6275e1 100644
--- a/app/components/BalanceBlocks.js
+++ b/app/components/BalanceBlocks.js
@@ -1,5 +1,5 @@
 import React from 'react';
-import cstyles from './Common.css';
+import cstyles from './Common.module.css';
 import Utils from '../utils/utils';
 
 // eslint-disable-next-line react/prop-types
diff --git a/app/components/Common.css b/app/components/Common.module.css
similarity index 100%
rename from app/components/Common.css
rename to app/components/Common.module.css
diff --git a/app/components/Dashboard.js b/app/components/Dashboard.js
index e888552..cdbbf5f 100644
--- a/app/components/Dashboard.js
+++ b/app/components/Dashboard.js
@@ -11,8 +11,8 @@ import {
   AccordionItemPanel,
   Accordion
 } from 'react-accessible-accordion';
-import styles from './Dashboard.css';
-import cstyles from './Common.css';
+import styles from './Dashboard.module.css';
+import cstyles from './Common.module.css';
 import { TotalBalance, Info, AddressBalance } from './AppState';
 import Utils from '../utils/utils';
 import ScrollPane from './ScrollPane';
diff --git a/app/components/Dashboard.css b/app/components/Dashboard.module.css
similarity index 100%
rename from app/components/Dashboard.css
rename to app/components/Dashboard.module.css
diff --git a/app/components/ErrorModal.js b/app/components/ErrorModal.js
index bcb8326..5ec8c46 100644
--- a/app/components/ErrorModal.js
+++ b/app/components/ErrorModal.js
@@ -1,7 +1,7 @@
 /* eslint-disable react/prop-types */
 import Modal from 'react-modal';
 import React from 'react';
-import cstyles from './Common.css';
+import cstyles from './Common.module.css';
 
 export class ErrorModalData {
   title: string;
diff --git a/app/components/LoadingScreen.js b/app/components/LoadingScreen.js
index 5882010..5cace7f 100644
--- a/app/components/LoadingScreen.js
+++ b/app/components/LoadingScreen.js
@@ -8,8 +8,8 @@ import native from '../../native/index.node';
 import routes from '../constants/routes.json';
 import { RPCConfig, Info } from './AppState';
 import RPC from '../rpc';
-import cstyles from './Common.css';
-import styles from './LoadingScreen.css';
+import cstyles from './Common.module.css';
+import styles from './LoadingScreen.module.css';
 import Logo from '../assets/img/logobig.png';
 
 type Props = {
diff --git a/app/components/LoadingScreen.css b/app/components/LoadingScreen.module.css
similarity index 100%
rename from app/components/LoadingScreen.css
rename to app/components/LoadingScreen.module.css
diff --git a/app/components/PasswordModal.js b/app/components/PasswordModal.js
index cd2e444..3210087 100644
--- a/app/components/PasswordModal.js
+++ b/app/components/PasswordModal.js
@@ -1,7 +1,7 @@
 // @flow
 import React, { PureComponent } from 'react';
 import Modal from 'react-modal';
-import cstyles from './Common.css';
+import cstyles from './Common.module.css';
 
 type Props = {
   modalIsOpen: boolean,
diff --git a/app/components/Receive.js b/app/components/Receive.js
index 4f29ae9..332999a 100644
--- a/app/components/Receive.js
+++ b/app/components/Receive.js
@@ -10,8 +10,8 @@ import {
 } from 'react-accessible-accordion';
 import QRCode from 'qrcode.react';
 import { shell, clipboard } from 'electron';
-import styles from './Receive.css';
-import cstyles from './Common.css';
+import styles from './Receive.module.css';
+import cstyles from './Common.module.css';
 import Utils from '../utils/utils';
 import { AddressBalance, Info, ReceivePageState, AddressBookEntry } from './AppState';
 import ScrollPane from './ScrollPane';
diff --git a/app/components/Receive.css b/app/components/Receive.module.css
similarity index 100%
rename from app/components/Receive.css
rename to app/components/Receive.module.css
diff --git a/app/components/Send.js b/app/components/Send.js
index b2250e3..4b571f6 100644
--- a/app/components/Send.js
+++ b/app/components/Send.js
@@ -10,8 +10,8 @@ import React, { PureComponent } from 'react';
 import Modal from 'react-modal';
 import TextareaAutosize from 'react-textarea-autosize';
 import { withRouter } from 'react-router-dom';
-import styles from './Send.css';
-import cstyles from './Common.css';
+import styles from './Send.module.css';
+import cstyles from './Common.module.css';
 import { ToAddr, AddressBalance, SendPageState, Info, AddressBookEntry, TotalBalance } from './AppState';
 import Utils from '../utils/utils';
 import ScrollPane from './ScrollPane';
diff --git a/app/components/Send.css b/app/components/Send.module.css
similarity index 100%
rename from app/components/Send.css
rename to app/components/Send.module.css
diff --git a/app/components/Sidebar.js b/app/components/Sidebar.js
index a7b5e2c..e5f44b8 100644
--- a/app/components/Sidebar.js
+++ b/app/components/Sidebar.js
@@ -10,8 +10,8 @@ import { Link } from 'react-router-dom';
 import { ipcRenderer } from 'electron';
 import TextareaAutosize from 'react-textarea-autosize';
 import PropTypes from 'prop-types';
-import styles from './Sidebar.css';
-import cstyles from './Common.css';
+import styles from './Sidebar.module.css';
+import cstyles from './Common.module.css';
 import routes from '../constants/routes.json';
 import Logo from '../assets/img/logobig.png';
 import { Info } from './AppState';
diff --git a/app/components/Sidebar.css b/app/components/Sidebar.module.css
similarity index 100%
rename from app/components/Sidebar.css
rename to app/components/Sidebar.module.css
diff --git a/app/components/Transactions.js b/app/components/Transactions.js
index 5b1c594..330c506 100644
--- a/app/components/Transactions.js
+++ b/app/components/Transactions.js
@@ -7,8 +7,8 @@ import dateformat from 'dateformat';
 import { shell } from 'electron';
 import { withRouter } from 'react-router';
 import { BalanceBlockHighlight } from './BalanceBlocks';
-import styles from './Transactions.css';
-import cstyles from './Common.css';
+import styles from './Transactions.module.css';
+import cstyles from './Common.module.css';
 import { Transaction, Info } from './AppState';
 import ScrollPane from './ScrollPane';
 import Utils from '../utils/utils';
@@ -126,7 +126,6 @@ const TxModalInternal = ({ modalIsOpen, tx, closeModal, currencyName, zecPrice,
           let replyTo = null;
           if (tx.type === 'receive' && memo) {
             const split = memo.split(/[ :\n\r\t]+/);
-            console.log(split);
             if (split && split.length > 0 && Utils.isSapling(split[split.length - 1])) {
               replyTo = split[split.length - 1];
             }
diff --git a/app/components/Transactions.css b/app/components/Transactions.module.css
similarity index 100%
rename from app/components/Transactions.css
rename to app/components/Transactions.module.css
diff --git a/app/components/WormholeConnection.js b/app/components/WormholeConnection.js
index 625598a..7f62e44 100644
--- a/app/components/WormholeConnection.js
+++ b/app/components/WormholeConnection.js
@@ -1,8 +1,8 @@
 import React, { PureComponent } from 'react';
 import QRCode from 'qrcode.react';
 import dateformat from 'dateformat';
-import cstyles from './Common.css';
-import styles from './WormholeConnection.css';
+import cstyles from './Common.module.css';
+import styles from './WormholeConnection.module.css';
 import CompanionAppListener from '../companion';
 import { ConnectedCompanionApp } from './AppState';
 
diff --git a/app/components/WormholeConnection.css b/app/components/WormholeConnection.module.css
similarity index 100%
rename from app/components/WormholeConnection.css
rename to app/components/WormholeConnection.module.css
diff --git a/app/components/Zcashd.js b/app/components/Zcashd.js
index 7a2c560..8b74f0e 100644
--- a/app/components/Zcashd.js
+++ b/app/components/Zcashd.js
@@ -1,8 +1,8 @@
 /* eslint-disable react/prop-types */
 import React, { Component } from 'react';
 import { Info } from './AppState';
-import cstyles from './Common.css';
-import styles from './Zcashd.css';
+import cstyles from './Common.module.css';
+import styles from './Zcashd.module.css';
 import ScrollPane from './ScrollPane';
 import Heart from '../assets/img/zcashdlogo.gif';
 
diff --git a/app/components/Zcashd.css b/app/components/Zcashd.module.css
similarity index 100%
rename from app/components/Zcashd.css
rename to app/components/Zcashd.module.css