diff --git a/packages/local-private/packages/activity-list/lib/activity-data-source.es6 b/packages/local-private/packages/activity-list/lib/activity-data-source.es6
index 4e3fad9b8..0f05b5766 100644
--- a/packages/local-private/packages/activity-list/lib/activity-data-source.es6
+++ b/packages/local-private/packages/activity-list/lib/activity-data-source.es6
@@ -1,5 +1,4 @@
-import Rx from 'rx-lite';
-import {Message, DatabaseStore} from 'nylas-exports';
+import {Rx, Message, DatabaseStore} from 'nylas-exports';
 
 export default class ActivityDataSource {
   buildObservable({openTrackingId, linkTrackingId, messageLimit}) {
diff --git a/packages/local-private/packages/composer-scheduler/lib/calendar/proposed-time-calendar-data-source.es6 b/packages/local-private/packages/composer-scheduler/lib/calendar/proposed-time-calendar-data-source.es6
index bca5155a8..15762d889 100644
--- a/packages/local-private/packages/composer-scheduler/lib/calendar/proposed-time-calendar-data-source.es6
+++ b/packages/local-private/packages/composer-scheduler/lib/calendar/proposed-time-calendar-data-source.es6
@@ -1,5 +1,4 @@
-import Rx from 'rx-lite'
-import {CalendarDataSource} from 'nylas-exports'
+import {Rx, CalendarDataSource} from 'nylas-exports'
 import ProposedTimeCalendarStore from '../proposed-time-calendar-store'
 
 export default class ProposedTimeCalendarDataSource extends CalendarDataSource {
diff --git a/packages/local-private/packages/nylas-private-salesforce/lib/composer/participant-decorator.jsx b/packages/local-private/packages/nylas-private-salesforce/lib/composer/participant-decorator.jsx
index 63255b9fa..0a70f7dd4 100644
--- a/packages/local-private/packages/nylas-private-salesforce/lib/composer/participant-decorator.jsx
+++ b/packages/local-private/packages/nylas-private-salesforce/lib/composer/participant-decorator.jsx
@@ -1,6 +1,5 @@
-import Rx from 'rx-lite'
 import React from 'react'
-import {DatabaseStore} from 'nylas-exports'
+import {Rx, DatabaseStore} from 'nylas-exports'
 
 import SalesforceIcon from '../shared-components/salesforce-icon'
 import SalesforceObject from '../models/salesforce-object'
diff --git a/packages/local-private/packages/nylas-private-salesforce/lib/main.jsx b/packages/local-private/packages/nylas-private-salesforce/lib/main.jsx
index bea68f9ab..a897c6cbd 100644
--- a/packages/local-private/packages/nylas-private-salesforce/lib/main.jsx
+++ b/packages/local-private/packages/nylas-private-salesforce/lib/main.jsx
@@ -1,6 +1,5 @@
-import Rx from 'rx-lite'
 import React from 'react'
-import {ComponentRegistry, WorkspaceStore} from 'nylas-exports'
+import {Rx, ComponentRegistry, WorkspaceStore} from 'nylas-exports'
 
 // Worker to fetch new Salesforce objects
 import SalesforceDataReset from './salesforce-data-reset'
diff --git a/packages/local-private/packages/nylas-private-salesforce/lib/related-object-helpers.es6 b/packages/local-private/packages/nylas-private-salesforce/lib/related-object-helpers.es6
index 51a842f0f..577f03b2a 100644
--- a/packages/local-private/packages/nylas-private-salesforce/lib/related-object-helpers.es6
+++ b/packages/local-private/packages/nylas-private-salesforce/lib/related-object-helpers.es6
@@ -1,7 +1,7 @@
 import _ from 'underscore'
-import Rx from 'rx-lite'
 
 import {
+  Rx,
   DatabaseStore,
   Thread,
 } from 'nylas-exports'
diff --git a/packages/local-private/packages/nylas-private-salesforce/lib/salesforce-related-object-cache.es6 b/packages/local-private/packages/nylas-private-salesforce/lib/salesforce-related-object-cache.es6
index fae7754e0..f2af6d8ff 100644
--- a/packages/local-private/packages/nylas-private-salesforce/lib/salesforce-related-object-cache.es6
+++ b/packages/local-private/packages/nylas-private-salesforce/lib/salesforce-related-object-cache.es6
@@ -1,7 +1,5 @@
 import _ from 'underscore'
-import Rx from 'rx-lite'
-
-import { AccountStore, DatabaseStore } from 'nylas-exports'
+import { Rx, AccountStore, DatabaseStore } from 'nylas-exports'
 import SalesforceObject from './models/salesforce-object'
 
 class SalesforceRelatedObjectCache {
diff --git a/packages/local-private/packages/nylas-private-salesforce/lib/search/salesforce-search-bar-results.jsx b/packages/local-private/packages/nylas-private-salesforce/lib/search/salesforce-search-bar-results.jsx
index 041172d63..069a105f1 100644
--- a/packages/local-private/packages/nylas-private-salesforce/lib/search/salesforce-search-bar-results.jsx
+++ b/packages/local-private/packages/nylas-private-salesforce/lib/search/salesforce-search-bar-results.jsx
@@ -1,7 +1,6 @@
 import _ from 'underscore'
-import Rx from 'rx-lite'
 import React from 'react'
-import {Thread, DatabaseStore} from 'nylas-exports'
+import {Rx, Thread, DatabaseStore} from 'nylas-exports'
 import SalesforceIcon from '../shared-components/salesforce-icon'
 import SalesforceObject from '../models/salesforce-object'
 import {relatedSObjectsForThread} from '../related-object-helpers'
diff --git a/packages/local-private/packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-button.jsx b/packages/local-private/packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-button.jsx
index 1254477c5..7839830ec 100644
--- a/packages/local-private/packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-button.jsx
+++ b/packages/local-private/packages/nylas-private-salesforce/lib/thread/salesforce-manually-relate-thread-button.jsx
@@ -1,10 +1,9 @@
 import _ from 'underscore'
-import Rx from 'rx-lite'
 import React from 'react'
 import ReactDOM from 'react-dom'
 
 import {RetinaImg, KeyCommandsRegion} from 'nylas-component-kit'
-import {Actions, FocusedContactsStore} from 'nylas-exports'
+import {Rx, Actions, FocusedContactsStore} from 'nylas-exports'
 
 import SalesforceEnv from '../salesforce-env'
 import SalesforceObject from '../models/salesforce-object'
diff --git a/packages/local-private/packages/send-reminders/lib/send-reminders-popover-button.jsx b/packages/local-private/packages/send-reminders/lib/send-reminders-popover-button.jsx
index a2bb0c655..b99850368 100644
--- a/packages/local-private/packages/send-reminders/lib/send-reminders-popover-button.jsx
+++ b/packages/local-private/packages/send-reminders/lib/send-reminders-popover-button.jsx
@@ -1,7 +1,6 @@
-import Rx from 'rx-lite';
 import React, {Component, PropTypes} from 'react';
 import ReactDOM from 'react-dom';
-import {Actions, Message, DatabaseStore} from 'nylas-exports';
+import {Rx, Actions, Message, DatabaseStore} from 'nylas-exports';
 import {RetinaImg, ListensToObservable} from 'nylas-component-kit';
 import SendRemindersPopover from './send-reminders-popover';
 import {getLatestMessage, setMessageReminder, reminderDateForMessage} from './send-reminders-utils'
diff --git a/packages/local-private/packages/send-reminders/lib/send-reminders-thread-timestamp.jsx b/packages/local-private/packages/send-reminders/lib/send-reminders-thread-timestamp.jsx
index 92e33506e..885531e7c 100644
--- a/packages/local-private/packages/send-reminders/lib/send-reminders-thread-timestamp.jsx
+++ b/packages/local-private/packages/send-reminders/lib/send-reminders-thread-timestamp.jsx
@@ -1,7 +1,6 @@
-import Rx from 'rx-lite'
 import React, {Component, PropTypes} from 'react';
 import {RetinaImg} from 'nylas-component-kit';
-import {Message, DatabaseStore, FocusedPerspectiveStore} from 'nylas-exports';
+import {Rx, Message, DatabaseStore, FocusedPerspectiveStore} from 'nylas-exports';
 import {getReminderLabel, getLatestMessageWithReminder, setMessageReminder} from './send-reminders-utils'
 import {PLUGIN_ID} from './send-reminders-constants';
 
diff --git a/packages/local-private/packages/send-reminders/lib/send-reminders-utils.es6 b/packages/local-private/packages/send-reminders/lib/send-reminders-utils.es6
index a82850f5e..05e078f9f 100644
--- a/packages/local-private/packages/send-reminders/lib/send-reminders-utils.es6
+++ b/packages/local-private/packages/send-reminders/lib/send-reminders-utils.es6
@@ -1,6 +1,6 @@
 import moment from 'moment'
-import Rx from 'rx-lite'
 import {
+  Rx,
   Thread,
   Message,
   Actions,