Merge pull request #1478 from mattermost/plt-1237

PLT-1237 Upgrading dependancies

165 files changed, 885 insertions, 859 deletions

diff --git a/web/react/.eslintignore b/web/react/.eslintignore
deleted file mode 100644
index 25a7df331..000000000
--- a/web/react/.eslintignore
+++ /dev/null
@@ -1,3 +0,0 @@
-**/*.json
-components/toggle_modal_button.jsx
-stores/modal_store.jsx
diff --git a/web/react/.eslintrc b/web/react/.eslintrc
index d4d28e863..29ca97faf 100644
--- a/web/react/.eslintrc
+++ b/web/react/.eslintrc
@@ -27,6 +27,8 @@
         },
         "rules": {
             "comma-dangle": [2, "never"],
+            "no-arrow-condition": 2,
+            "no-case-declarations": 2,
             "no-cond-assign": [2, "except-parens"],
             "no-console": 2,
             "no-constant-condition": 2,
@@ -35,14 +37,17 @@
             "no-dupe-keys": 2,
             "no-duplicate-case": 2,
             "no-empty": 2,
+            "no-empty-pattern": 2,
             "no-ex-assign": 2,
             "no-extra-semi": 2,
+            "no-fallthrough": 2,
             "no-func-assign": 2,
             "no-inner-declarations": 0,
             "no-invalid-regexp": 2,
             "no-irregular-whitespace": 2,
             "no-unexpected-multiline": 2,
             "no-unreachable": 2,
+            "no-magic-numbers": [0, { "enforceConst": true, "detectObjects": true } ],
             "valid-typeof": 2,
 
             "block-scoped-var": 2,
@@ -150,6 +155,7 @@
 
             // ES6 stuff
             "arrow-parens": [2, "always"],
+            "arrow-body-style": 0,
             "arrow-spacing": [2, { "before": true, "after": true }],
             "constructor-super": 2,
             "generator-star-spacing": [2, {"before": false, "after": true}],
@@ -172,7 +178,9 @@
             "react/jsx-closing-bracket-location": [2, { "location": "tag-aligned" }],
             "react/jsx-curly-spacing": [2, "never"],
             "react/jsx-indent-props": [2, 4],
+            "react/jsx-key": 2,
             "react/jsx-max-props-per-line": [2, { "maximum": 1 }],
+            "react/jsx-no-bind": 1,
             "react/jsx-no-duplicate-props": [2, { "ignoreCase": false }],
             "react/jsx-no-literals": 1,
             "react/jsx-no-undef": 2,
@@ -181,13 +189,14 @@
             "react/no-danger": 0,
             "react/no-did-mount-set-state": 2,
             "react/no-did-update-set-state": 2,
+            "react/no-direct-mutation-state": 2,
             "react/no-multi-comp": 2,
             "react/no-set-state": 0,
             "react/no-unknown-property": 2,
+            "react/prefer-es6-class": 2,
             "react/prop-types": 2,
             "react/self-closing-comp": 2,
             "react/sort-comp": 0,
-            "react/wrap-multilines": 2,
-            "react/no-direct-mutation-state": 2
+            "react/wrap-multilines": 2
         }
 }
diff --git a/web/react/components/access_history_modal.jsx b/web/react/components/access_history_modal.jsx
index 65b80dfb7..165d32339 100644
--- a/web/react/components/access_history_modal.jsx
+++ b/web/react/components/access_history_modal.jsx
@@ -2,11 +2,11 @@
 // See License.txt for license information.
 
 var Modal = ReactBootstrap.Modal;
-var UserStore = require('../stores/user_store.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var AsyncClient = require('../utils/async_client.jsx');
-var LoadingScreen = require('./loading_screen.jsx');
-var Utils = require('../utils/utils.jsx');
+import UserStore from '../stores/user_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import LoadingScreen from './loading_screen.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 export default class AccessHistoryModal extends React.Component {
     constructor(props) {
@@ -106,7 +106,7 @@ export default class AccessHistoryModal extends React.Component {
             case '/channels/update_header':
                 currentAuditDesc = 'Updated the ' + channelName + ' channel/group header';
                 break;
-            default:
+            default: {
                 let userIdField = [];
                 let userId = '';
                 let username = '';
@@ -130,11 +130,12 @@ export default class AccessHistoryModal extends React.Component {
 
                 break;
             }
+            }
         } else if (currentActionURL.indexOf('/oauth') === 0) {
             const oauthInfo = currentAudit.extra_info.split(' ');
 
             switch (currentActionURL) {
-            case '/oauth/register':
+            case '/oauth/register': {
                 const clientIdField = oauthInfo[0].split('=');
 
                 if (clientIdField[0] === 'client_id') {
@@ -142,6 +143,7 @@ export default class AccessHistoryModal extends React.Component {
                 }
 
                 break;
+            }
             case '/oauth/allow':
                 if (oauthInfo[0] === 'attempt') {
                     currentAuditDesc = 'Attempted to allow a new OAuth service access';
@@ -202,7 +204,7 @@ export default class AccessHistoryModal extends React.Component {
                 }
 
                 break;
-            case '/users/update_roles':
+            case '/users/update_roles': {
                 const userRoles = userInfo[0].split('=')[1];
 
                 currentAuditDesc = 'Updated user role(s) to ';
@@ -213,7 +215,8 @@ export default class AccessHistoryModal extends React.Component {
                 }
 
                 break;
-            case '/users/update_active':
+            }
+            case '/users/update_active': {
                 const updateType = userInfo[0].split('=')[0];
                 const updateField = userInfo[0].split('=')[1];
 
@@ -240,6 +243,7 @@ export default class AccessHistoryModal extends React.Component {
                 }
 
                 break;
+            }
             case '/users/send_password_reset':
                 currentAuditDesc = 'Sent an email to ' + userInfo[0].split('=')[1] + ' to reset your password';
                 break;
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx
index 5824ce7e2..869d648d2 100644
--- a/web/react/components/activity_log_modal.jsx
+++ b/web/react/components/activity_log_modal.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const UserStore = require('../stores/user_store.jsx');
-const Client = require('../utils/client.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
+import UserStore from '../stores/user_store.jsx';
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
 const Modal = ReactBootstrap.Modal;
-const LoadingScreen = require('./loading_screen.jsx');
-const Utils = require('../utils/utils.jsx');
+import LoadingScreen from './loading_screen.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 export default class ActivityLogModal extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/admin_controller.jsx b/web/react/components/admin_console/admin_controller.jsx
index 8e0ab0555..4f144b0dd 100644
--- a/web/react/components/admin_console/admin_controller.jsx
+++ b/web/react/components/admin_console/admin_controller.jsx
@@ -1,25 +1,25 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AdminSidebar = require('./admin_sidebar.jsx');
-var AdminStore = require('../../stores/admin_store.jsx');
-var TeamStore = require('../../stores/team_store.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
-var LoadingScreen = require('../loading_screen.jsx');
-var Utils = require('../../utils/utils.jsx');
-
-var EmailSettingsTab = require('./email_settings.jsx');
-var LogSettingsTab = require('./log_settings.jsx');
-var LogsTab = require('./logs.jsx');
-var FileSettingsTab = require('./image_settings.jsx');
-var PrivacySettingsTab = require('./privacy_settings.jsx');
-var RateSettingsTab = require('./rate_settings.jsx');
-var GitLabSettingsTab = require('./gitlab_settings.jsx');
-var SqlSettingsTab = require('./sql_settings.jsx');
-var TeamSettingsTab = require('./team_settings.jsx');
-var ServiceSettingsTab = require('./service_settings.jsx');
-var TeamUsersTab = require('./team_users.jsx');
-var TeamAnalyticsTab = require('./team_analytics.jsx');
+import AdminSidebar from './admin_sidebar.jsx';
+import AdminStore from '../../stores/admin_store.jsx';
+import TeamStore from '../../stores/team_store.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
+import LoadingScreen from '../loading_screen.jsx';
+import * as Utils from '../../utils/utils.jsx';
+
+import EmailSettingsTab from './email_settings.jsx';
+import LogSettingsTab from './log_settings.jsx';
+import LogsTab from './logs.jsx';
+import FileSettingsTab from './image_settings.jsx';
+import PrivacySettingsTab from './privacy_settings.jsx';
+import RateSettingsTab from './rate_settings.jsx';
+import GitLabSettingsTab from './gitlab_settings.jsx';
+import SqlSettingsTab from './sql_settings.jsx';
+import TeamSettingsTab from './team_settings.jsx';
+import ServiceSettingsTab from './service_settings.jsx';
+import TeamUsersTab from './team_users.jsx';
+import TeamAnalyticsTab from './team_analytics.jsx';
 
 export default class AdminController extends React.Component {
     constructor(props) {
@@ -189,4 +189,12 @@ export default class AdminController extends React.Component {
             </div>
         );
     }
-}
\ No newline at end of file
+}
+
+AdminController.defaultProps = {
+};
+
+AdminController.propTypes = {
+    tab: React.PropTypes.string,
+    teamId: React.PropTypes.string
+};
diff --git a/web/react/components/admin_console/admin_navbar_dropdown.jsx b/web/react/components/admin_console/admin_navbar_dropdown.jsx
index df8da94e1..783d45de6 100644
--- a/web/react/components/admin_console/admin_navbar_dropdown.jsx
+++ b/web/react/components/admin_console/admin_navbar_dropdown.jsx
@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../../utils/utils.jsx');
-var Client = require('../../utils/client.jsx');
-var TeamStore = require('../../stores/team_store.jsx');
+import * as Utils from '../../utils/utils.jsx';
+import * as Client from '../../utils/client.jsx';
+import TeamStore from '../../stores/team_store.jsx';
 
-var Constants = require('../../utils/constants.jsx');
+import Constants from '../../utils/constants.jsx';
 
 function getStateFromStores() {
     return {currentTeam: TeamStore.getCurrent()};
diff --git a/web/react/components/admin_console/admin_sidebar.jsx b/web/react/components/admin_console/admin_sidebar.jsx
index 0d52ae347..076a07618 100644
--- a/web/react/components/admin_console/admin_sidebar.jsx
+++ b/web/react/components/admin_console/admin_sidebar.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AdminSidebarHeader = require('./admin_sidebar_header.jsx');
-var SelectTeamModal = require('./select_team_modal.jsx');
-var Utils = require('../../utils/utils.jsx');
+import AdminSidebarHeader from './admin_sidebar_header.jsx';
+import SelectTeamModal from './select_team_modal.jsx';
+import * as Utils from '../../utils/utils.jsx';
 
 export default class AdminSidebar extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/admin_sidebar_header.jsx b/web/react/components/admin_console/admin_sidebar_header.jsx
index fd6d92c4a..bfd479939 100644
--- a/web/react/components/admin_console/admin_sidebar_header.jsx
+++ b/web/react/components/admin_console/admin_sidebar_header.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AdminNavbarDropdown = require('./admin_navbar_dropdown.jsx');
-var UserStore = require('../../stores/user_store.jsx');
-var Utils = require('../../utils/utils.jsx');
+import AdminNavbarDropdown from './admin_navbar_dropdown.jsx';
+import UserStore from '../../stores/user_store.jsx';
+import * as Utils from '../../utils/utils.jsx';
 
 export default class SidebarHeader extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/email_settings.jsx b/web/react/components/admin_console/email_settings.jsx
index 0cabf7f70..d0565a0e0 100644
--- a/web/react/components/admin_console/email_settings.jsx
+++ b/web/react/components/admin_console/email_settings.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
-var crypto = require('crypto');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
+import crypto from 'crypto';
 
 export default class EmailSettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/gitlab_settings.jsx b/web/react/components/admin_console/gitlab_settings.jsx
index f8fb6d115..8c689a2d8 100644
--- a/web/react/components/admin_console/gitlab_settings.jsx
+++ b/web/react/components/admin_console/gitlab_settings.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class GitLabSettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/image_settings.jsx b/web/react/components/admin_console/image_settings.jsx
index 8b577e012..e1ffad7d3 100644
--- a/web/react/components/admin_console/image_settings.jsx
+++ b/web/react/components/admin_console/image_settings.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
-var crypto = require('crypto');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
+import crypto from 'crypto';
 
 export default class FileSettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/log_settings.jsx b/web/react/components/admin_console/log_settings.jsx
index 7e9eda89b..a91cc57ab 100644
--- a/web/react/components/admin_console/log_settings.jsx
+++ b/web/react/components/admin_console/log_settings.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class LogSettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/logs.jsx b/web/react/components/admin_console/logs.jsx
index 3449c78d9..01135f1b8 100644
--- a/web/react/components/admin_console/logs.jsx
+++ b/web/react/components/admin_console/logs.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AdminStore = require('../../stores/admin_store.jsx');
-var LoadingScreen = require('../loading_screen.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
+import AdminStore from '../../stores/admin_store.jsx';
+import LoadingScreen from '../loading_screen.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class Logs extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/privacy_settings.jsx b/web/react/components/admin_console/privacy_settings.jsx
index f2d22f36e..61393f1c6 100644
--- a/web/react/components/admin_console/privacy_settings.jsx
+++ b/web/react/components/admin_console/privacy_settings.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class PrivacySettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/rate_settings.jsx b/web/react/components/admin_console/rate_settings.jsx
index 4d71777c4..ca9fcb074 100644
--- a/web/react/components/admin_console/rate_settings.jsx
+++ b/web/react/components/admin_console/rate_settings.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class RateSettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/reset_password_modal.jsx b/web/react/components/admin_console/reset_password_modal.jsx
index 35d3cdd17..5ff7c3413 100644
--- a/web/react/components/admin_console/reset_password_modal.jsx
+++ b/web/react/components/admin_console/reset_password_modal.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
+import * as Client from '../../utils/client.jsx';
 var Modal = ReactBootstrap.Modal;
 
 export default class ResetPasswordModal extends React.Component {
diff --git a/web/react/components/admin_console/service_settings.jsx b/web/react/components/admin_console/service_settings.jsx
index 53c89a942..908eb709a 100644
--- a/web/react/components/admin_console/service_settings.jsx
+++ b/web/react/components/admin_console/service_settings.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class ServiceSettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/sql_settings.jsx b/web/react/components/admin_console/sql_settings.jsx
index b43108bf7..2a55f7324 100644
--- a/web/react/components/admin_console/sql_settings.jsx
+++ b/web/react/components/admin_console/sql_settings.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
-var crypto = require('crypto');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
+import crypto from 'crypto';
 
 export default class SqlSettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/team_analytics.jsx b/web/react/components/admin_console/team_analytics.jsx
index 0c9d1f61b..6c8e63c83 100644
--- a/web/react/components/admin_console/team_analytics.jsx
+++ b/web/react/components/admin_console/team_analytics.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var Utils = require('../../utils/utils.jsx');
-var LineChart = require('./line_chart.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as Utils from '../../utils/utils.jsx';
+import LineChart from './line_chart.jsx';
 
 export default class TeamAnalytics extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/team_settings.jsx b/web/react/components/admin_console/team_settings.jsx
index 6587184ea..7991b9a01 100644
--- a/web/react/components/admin_console/team_settings.jsx
+++ b/web/react/components/admin_console/team_settings.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
 
 export default class TeamSettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/team_users.jsx b/web/react/components/admin_console/team_users.jsx
index 7161139e6..2d9657956 100644
--- a/web/react/components/admin_console/team_users.jsx
+++ b/web/react/components/admin_console/team_users.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var LoadingScreen = require('../loading_screen.jsx');
-var UserItem = require('./user_item.jsx');
-var ResetPasswordModal = require('./reset_password_modal.jsx');
+import * as Client from '../../utils/client.jsx';
+import LoadingScreen from '../loading_screen.jsx';
+import UserItem from './user_item.jsx';
+import ResetPasswordModal from './reset_password_modal.jsx';
 
 export default class UserList extends React.Component {
     constructor(props) {
diff --git a/web/react/components/admin_console/user_item.jsx b/web/react/components/admin_console/user_item.jsx
index 2badaf0e5..bd64564c9 100644
--- a/web/react/components/admin_console/user_item.jsx
+++ b/web/react/components/admin_console/user_item.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var Utils = require('../../utils/utils.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as Utils from '../../utils/utils.jsx';
 
 export default class UserItem extends React.Component {
     constructor(props) {
diff --git a/web/react/components/authorize.jsx b/web/react/components/authorize.jsx
index 74709bcab..32e39fbff 100644
--- a/web/react/components/authorize.jsx
+++ b/web/react/components/authorize.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
 
 export default class Authorize extends React.Component {
     constructor(props) {
diff --git a/web/react/components/center_panel.jsx b/web/react/components/center_panel.jsx
index 3ee40bb86..c2ecf4fa2 100644
--- a/web/react/components/center_panel.jsx
+++ b/web/react/components/center_panel.jsx
@@ -1,17 +1,17 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const TutorialIntroScreens = require('./tutorial/tutorial_intro_screens.jsx');
-const CreatePost = require('./create_post.jsx');
-const PostsViewContainer = require('./posts_view_container.jsx');
-const ChannelHeader = require('./channel_header.jsx');
-const Navbar = require('./navbar.jsx');
-const FileUploadOverlay = require('./file_upload_overlay.jsx');
+import TutorialIntroScreens from './tutorial/tutorial_intro_screens.jsx';
+import CreatePost from './create_post.jsx';
+import PostsViewContainer from './posts_view_container.jsx';
+import ChannelHeader from './channel_header.jsx';
+import Navbar from './navbar.jsx';
+import FileUploadOverlay from './file_upload_overlay.jsx';
 
-const PreferenceStore = require('../stores/preference_store.jsx');
-const UserStore = require('../stores/user_store.jsx');
+import PreferenceStore from '../stores/preference_store.jsx';
+import UserStore from '../stores/user_store.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const TutorialSteps = Constants.TutorialSteps;
 const Preferences = Constants.Preferences;
 
diff --git a/web/react/components/change_url_modal.jsx b/web/react/components/change_url_modal.jsx
index 714e93ff8..bbe93f58d 100644
--- a/web/react/components/change_url_modal.jsx
+++ b/web/react/components/change_url_modal.jsx
@@ -2,7 +2,7 @@
 // See License.txt for license information.
 
 var Modal = ReactBootstrap.Modal;
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class ChangeUrlModal extends React.Component {
     constructor(props) {
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index e46b2ccd7..8c721348f 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -1,28 +1,28 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const NavbarSearchBox = require('./search_bar.jsx');
-const MessageWrapper = require('./message_wrapper.jsx');
-const PopoverListMembers = require('./popover_list_members.jsx');
-const EditChannelPurposeModal = require('./edit_channel_purpose_modal.jsx');
-const ChannelInfoModal = require('./channel_info_modal.jsx');
-const ChannelInviteModal = require('./channel_invite_modal.jsx');
-const ChannelMembersModal = require('./channel_members_modal.jsx');
-const ChannelNotificationsModal = require('./channel_notifications_modal.jsx');
-const DeleteChannelModal = require('./delete_channel_modal.jsx');
-const ToggleModalButton = require('./toggle_modal_button.jsx');
+import NavbarSearchBox from './search_bar.jsx';
+import MessageWrapper from './message_wrapper.jsx';
+import PopoverListMembers from './popover_list_members.jsx';
+import EditChannelPurposeModal from './edit_channel_purpose_modal.jsx';
+import ChannelInfoModal from './channel_info_modal.jsx';
+import ChannelInviteModal from './channel_invite_modal.jsx';
+import ChannelMembersModal from './channel_members_modal.jsx';
+import ChannelNotificationsModal from './channel_notifications_modal.jsx';
+import DeleteChannelModal from './delete_channel_modal.jsx';
+import ToggleModalButton from './toggle_modal_button.jsx';
 
-const ChannelStore = require('../stores/channel_store.jsx');
-const UserStore = require('../stores/user_store.jsx');
-const SearchStore = require('../stores/search_store.jsx');
-const PreferenceStore = require('../stores/preference_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import SearchStore from '../stores/search_store.jsx';
+import PreferenceStore from '../stores/preference_store.jsx';
 
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-const Utils = require('../utils/utils.jsx');
-const TextFormatting = require('../utils/text_formatting.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
-const Client = require('../utils/client.jsx');
-const Constants = require('../utils/constants.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import * as Utils from '../utils/utils.jsx';
+import * as TextFormatting from '../utils/text_formatting.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import * as Client from '../utils/client.jsx';
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 
 const Popover = ReactBootstrap.Popover;
diff --git a/web/react/components/channel_invite_modal.jsx b/web/react/components/channel_invite_modal.jsx
index 47bc50971..6d3203ae5 100644
--- a/web/react/components/channel_invite_modal.jsx
+++ b/web/react/components/channel_invite_modal.jsx
@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const MemberList = require('./member_list.jsx');
-const LoadingScreen = require('./loading_screen.jsx');
+import MemberList from './member_list.jsx';
+import LoadingScreen from './loading_screen.jsx';
 
-const UserStore = require('../stores/user_store.jsx');
-const ChannelStore = require('../stores/channel_store.jsx');
+import UserStore from '../stores/user_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
 
-const Utils = require('../utils/utils.jsx');
-const Client = require('../utils/client.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
 
 const Modal = ReactBootstrap.Modal;
 
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx
index 4fc115a92..e29c659c7 100644
--- a/web/react/components/channel_loader.jsx
+++ b/web/react/components/channel_loader.jsx
@@ -5,14 +5,14 @@
     to the server on page load. This is to prevent other React controls from spamming
     AsyncClient with requests. */
 
-var AsyncClient = require('../utils/async_client.jsx');
-var SocketStore = require('../stores/socket_store.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var PostStore = require('../stores/post_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
-
-var Utils = require('../utils/utils.jsx');
-var Constants = require('../utils/constants.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
+import SocketStore from '../stores/socket_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import PostStore from '../stores/post_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+
+import * as Utils from '../utils/utils.jsx';
+import Constants from '../utils/constants.jsx';
 
 export default class ChannelLoader extends React.Component {
     constructor(props) {
diff --git a/web/react/components/channel_members_modal.jsx b/web/react/components/channel_members_modal.jsx
index 5cf3511f4..08ad95091 100644
--- a/web/react/components/channel_members_modal.jsx
+++ b/web/react/components/channel_members_modal.jsx
@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const MemberList = require('./member_list.jsx');
-const ChannelInviteModal = require('./channel_invite_modal.jsx');
+import MemberList from './member_list.jsx';
+import ChannelInviteModal from './channel_invite_modal.jsx';
 
-const UserStore = require('../stores/user_store.jsx');
-const ChannelStore = require('../stores/channel_store.jsx');
+import UserStore from '../stores/user_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
 
-const AsyncClient = require('../utils/async_client.jsx');
-const Client = require('../utils/client.jsx');
-const Utils = require('../utils/utils.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
+import * as Client from '../utils/client.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 const Modal = ReactBootstrap.Modal;
 
diff --git a/web/react/components/channel_notifications_modal.jsx b/web/react/components/channel_notifications_modal.jsx
index c8bd1c2dc..4af95c88f 100644
--- a/web/react/components/channel_notifications_modal.jsx
+++ b/web/react/components/channel_notifications_modal.jsx
@@ -2,12 +2,12 @@
 // See License.txt for license information.
 
 var Modal = ReactBootstrap.Modal;
-var SettingItemMin = require('./setting_item_min.jsx');
-var SettingItemMax = require('./setting_item_max.jsx');
+import SettingItemMin from './setting_item_min.jsx';
+import SettingItemMax from './setting_item_max.jsx';
 
-var Client = require('../utils/client.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
+import * as Client from '../utils/client.jsx';
+import UserStore from '../stores/user_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
 
 export default class ChannelNotificationsModal extends React.Component {
     constructor(props) {
diff --git a/web/react/components/channel_view.jsx b/web/react/components/channel_view.jsx
index 3f53a94c2..7cbb638a0 100644
--- a/web/react/components/channel_view.jsx
+++ b/web/react/components/channel_view.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const CenterPanel = require('../components/center_panel.jsx');
-const Sidebar = require('../components/sidebar.jsx');
-const SidebarRight = require('../components/sidebar_right.jsx');
-const SidebarRightMenu = require('../components/sidebar_right_menu.jsx');
+import CenterPanel from '../components/center_panel.jsx';
+import Sidebar from '../components/sidebar.jsx';
+import SidebarRight from '../components/sidebar_right.jsx';
+import SidebarRightMenu from '../components/sidebar_right_menu.jsx';
 
 export default class ChannelView extends React.Component {
     constructor(props) {
diff --git a/web/react/components/command_list.jsx b/web/react/components/command_list.jsx
index a6d9d5d70..ff83d0420 100644
--- a/web/react/components/command_list.jsx
+++ b/web/react/components/command_list.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
 
 export default class CommandList extends React.Component {
     constructor(props) {
@@ -13,14 +13,14 @@ export default class CommandList extends React.Component {
         this.getSuggestedCommands = this.getSuggestedCommands.bind(this);
 
         this.state = {
-            suggestions: [ ],
+            suggestions: [],
             cmd: ''
         };
     }
 
     handleClick(i) {
         this.props.addCommand(this.state.suggestions[i].suggestion);
-        this.setState({suggestions: [ ], cmd: ''});
+        this.setState({suggestions: [], cmd: ''});
     }
 
     addFirstCommand() {
@@ -36,7 +36,7 @@ export default class CommandList extends React.Component {
 
     getSuggestedCommands(cmd) {
         if (!cmd || cmd.charAt(0) !== '/') {
-            this.setState({suggestions: [ ], cmd: ''});
+            this.setState({suggestions: [], cmd: ''});
             return;
         }
 
diff --git a/web/react/components/create_comment.jsx b/web/react/components/create_comment.jsx
index 22a659ed5..8ceda1cf7 100644
--- a/web/react/components/create_comment.jsx
+++ b/web/react/components/create_comment.jsx
@@ -1,21 +1,21 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-const Client = require('../utils/client.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
-const SocketStore = require('../stores/socket_store.jsx');
-const ChannelStore = require('../stores/channel_store.jsx');
-const UserStore = require('../stores/user_store.jsx');
-const PostStore = require('../stores/post_store.jsx');
-const PreferenceStore = require('../stores/preference_store.jsx');
-const Textbox = require('./textbox.jsx');
-const MsgTyping = require('./msg_typing.jsx');
-const FileUpload = require('./file_upload.jsx');
-const FilePreview = require('./file_preview.jsx');
-const Utils = require('../utils/utils.jsx');
-
-const Constants = require('../utils/constants.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import SocketStore from '../stores/socket_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import PostStore from '../stores/post_store.jsx';
+import PreferenceStore from '../stores/preference_store.jsx';
+import Textbox from './textbox.jsx';
+import MsgTyping from './msg_typing.jsx';
+import FileUpload from './file_upload.jsx';
+import FilePreview from './file_preview.jsx';
+import * as Utils from '../utils/utils.jsx';
+
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 const KeyCodes = Constants.KeyCodes;
 
diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index d823a54f1..0a2979e21 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -1,24 +1,24 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const MsgTyping = require('./msg_typing.jsx');
-const Textbox = require('./textbox.jsx');
-const FileUpload = require('./file_upload.jsx');
-const FilePreview = require('./file_preview.jsx');
-const TutorialTip = require('./tutorial/tutorial_tip.jsx');
-
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-const Client = require('../utils/client.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
-const Utils = require('../utils/utils.jsx');
-
-const ChannelStore = require('../stores/channel_store.jsx');
-const PostStore = require('../stores/post_store.jsx');
-const UserStore = require('../stores/user_store.jsx');
-const PreferenceStore = require('../stores/preference_store.jsx');
-const SocketStore = require('../stores/socket_store.jsx');
-
-const Constants = require('../utils/constants.jsx');
+import MsgTyping from './msg_typing.jsx';
+import Textbox from './textbox.jsx';
+import FileUpload from './file_upload.jsx';
+import FilePreview from './file_preview.jsx';
+import TutorialTip from './tutorial/tutorial_tip.jsx';
+
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import * as Utils from '../utils/utils.jsx';
+
+import ChannelStore from '../stores/channel_store.jsx';
+import PostStore from '../stores/post_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import PreferenceStore from '../stores/preference_store.jsx';
+import SocketStore from '../stores/socket_store.jsx';
+
+import Constants from '../utils/constants.jsx';
 const Preferences = Constants.Preferences;
 const TutorialSteps = Constants.TutorialSteps;
 const ActionTypes = Constants.ActionTypes;
diff --git a/web/react/components/delete_channel_modal.jsx b/web/react/components/delete_channel_modal.jsx
index 271f21c3a..99bae962a 100644
--- a/web/react/components/delete_channel_modal.jsx
+++ b/web/react/components/delete_channel_modal.jsx
@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AsyncClient = require('../utils/async_client.jsx');
-const Client = require('../utils/client.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
+import * as Client from '../utils/client.jsx';
 const Modal = ReactBootstrap.Modal;
-const TeamStore = require('../stores/team_store.jsx');
-const Utils = require('../utils/utils.jsx');
+import TeamStore from '../stores/team_store.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 export default class DeleteChannelModal extends React.Component {
     constructor(props) {
diff --git a/web/react/components/delete_post_modal.jsx b/web/react/components/delete_post_modal.jsx
index e0489856f..fab5b60ea 100644
--- a/web/react/components/delete_post_modal.jsx
+++ b/web/react/components/delete_post_modal.jsx
@@ -1,14 +1,14 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
-var PostStore = require('../stores/post_store.jsx');
-var ModalStore = require('../stores/modal_store.jsx');
+import * as Client from '../utils/client.jsx';
+import PostStore from '../stores/post_store.jsx';
+import ModalStore from '../stores/modal_store.jsx';
 var Modal = ReactBootstrap.Modal;
-var Utils = require('../utils/utils.jsx');
-var AsyncClient = require('../utils/async_client.jsx');
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var Constants = require('../utils/constants.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 export default class DeletePostModal extends React.Component {
diff --git a/web/react/components/docs.jsx b/web/react/components/docs.jsx
index 68baa6dad..188ca340b 100644
--- a/web/react/components/docs.jsx
+++ b/web/react/components/docs.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const TextFormatting = require('../utils/text_formatting.jsx');
-const UserStore = require('../stores/user_store.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
+import UserStore from '../stores/user_store.jsx';
 
 export default class Docs extends React.Component {
     constructor(props) {
diff --git a/web/react/components/edit_channel_modal.jsx b/web/react/components/edit_channel_modal.jsx
index 2557a55ca..80dab4a57 100644
--- a/web/react/components/edit_channel_modal.jsx
+++ b/web/react/components/edit_channel_modal.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Client = require('../utils/client.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
 
 export default class EditChannelModal extends React.Component {
     constructor(props) {
diff --git a/web/react/components/edit_channel_purpose_modal.jsx b/web/react/components/edit_channel_purpose_modal.jsx
index 85a6c8f53..af23342ae 100644
--- a/web/react/components/edit_channel_purpose_modal.jsx
+++ b/web/react/components/edit_channel_purpose_modal.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AsyncClient = require('../utils/async_client.jsx');
-const Client = require('../utils/client.jsx');
-const Utils = require('../utils/utils.jsx');
+import * as AsyncClient from '../utils/async_client.jsx';
+import * as Client from '../utils/client.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 const Modal = ReactBootstrap.Modal;
 
diff --git a/web/react/components/edit_post_modal.jsx b/web/react/components/edit_post_modal.jsx
index c75da75c9..ddbdee8a4 100644
--- a/web/react/components/edit_post_modal.jsx
+++ b/web/react/components/edit_post_modal.jsx
@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
-var AsyncClient = require('../utils/async_client.jsx');
-var DeletePostModal = require('./delete_post_modal.jsx');
-var Textbox = require('./textbox.jsx');
-var BrowserStore = require('../stores/browser_store.jsx');
-var PostStore = require('../stores/post_store.jsx');
-var PreferenceStore = require('../stores/preference_store.jsx');
-
-var Constants = require('../utils/constants.jsx');
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import DeletePostModal from './delete_post_modal.jsx';
+import Textbox from './textbox.jsx';
+import BrowserStore from '../stores/browser_store.jsx';
+import PostStore from '../stores/post_store.jsx';
+import PreferenceStore from '../stores/preference_store.jsx';
+
+import Constants from '../utils/constants.jsx';
 var KeyCodes = Constants.KeyCodes;
 
 export default class EditPostModal extends React.Component {
diff --git a/web/react/components/error_bar.jsx b/web/react/components/error_bar.jsx
index f098384aa..921e8afe1 100644
--- a/web/react/components/error_bar.jsx
+++ b/web/react/components/error_bar.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var ErrorStore = require('../stores/error_store.jsx');
+import ErrorStore from '../stores/error_store.jsx';
 
 export default class ErrorBar extends React.Component {
     constructor() {
diff --git a/web/react/components/file_attachment.jsx b/web/react/components/file_attachment.jsx
index d6a30abf9..2474b3d8a 100644
--- a/web/react/components/file_attachment.jsx
+++ b/web/react/components/file_attachment.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
-var Client = require('../utils/client.jsx');
-var Constants = require('../utils/constants.jsx');
+import * as utils from '../utils/utils.jsx';
+import * as Client from '../utils/client.jsx';
+import Constants from '../utils/constants.jsx';
 
 export default class FileAttachment extends React.Component {
     constructor(props) {
diff --git a/web/react/components/file_attachment_list.jsx b/web/react/components/file_attachment_list.jsx
index ae08e5635..da1b2ba3d 100644
--- a/web/react/components/file_attachment_list.jsx
+++ b/web/react/components/file_attachment_list.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var ViewImageModal = require('./view_image.jsx');
-var FileAttachment = require('./file_attachment.jsx');
-var Constants = require('../utils/constants.jsx');
+import ViewImageModal from './view_image.jsx';
+import FileAttachment from './file_attachment.jsx';
+import Constants from '../utils/constants.jsx';
 
 export default class FileAttachmentList extends React.Component {
     constructor(props) {
diff --git a/web/react/components/file_preview.jsx b/web/react/components/file_preview.jsx
index b8c86ed67..d625a811e 100644
--- a/web/react/components/file_preview.jsx
+++ b/web/react/components/file_preview.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class FilePreview extends React.Component {
     constructor(props) {
diff --git a/web/react/components/file_upload.jsx b/web/react/components/file_upload.jsx
index 8854a54df..9316ca9a5 100644
--- a/web/react/components/file_upload.jsx
+++ b/web/react/components/file_upload.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var client = require('../utils/client.jsx');
-var Constants = require('../utils/constants.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var utils = require('../utils/utils.jsx');
+import * as client from '../utils/client.jsx';
+import Constants from '../utils/constants.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import * as utils from '../utils/utils.jsx';
 
 export default class FileUpload extends React.Component {
     constructor(props) {
diff --git a/web/react/components/find_team.jsx b/web/react/components/find_team.jsx
index bd3c11973..94ca48dbf 100644
--- a/web/react/components/find_team.jsx
+++ b/web/react/components/find_team.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
-var client = require('../utils/client.jsx');
+import * as utils from '../utils/utils.jsx';
+import * as client from '../utils/client.jsx';
 
 export default class FindTeam extends React.Component {
     constructor(props) {
diff --git a/web/react/components/get_link_modal.jsx b/web/react/components/get_link_modal.jsx
index 8839bc3c7..2bd2c42d6 100644
--- a/web/react/components/get_link_modal.jsx
+++ b/web/react/components/get_link_modal.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
 
 export default class GetLinkModal extends React.Component {
     constructor(props) {
diff --git a/web/react/components/invite_member_modal.jsx b/web/react/components/invite_member_modal.jsx
index 3f6ad3358..7df75252e 100644
--- a/web/react/components/invite_member_modal.jsx
+++ b/web/react/components/invite_member_modal.jsx
@@ -1,14 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
-var ActionTypes = require('../utils/constants.jsx').ActionTypes;
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var Client = require('../utils/client.jsx');
-var ModalStore = require('../stores/modal_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var TeamStore = require('../stores/team_store.jsx');
-var ConfirmModal = require('./confirm_modal.jsx');
+import * as utils from '../utils/utils.jsx';
+import Constants from '../utils/constants.jsx';
+const ActionTypes = Constants.ActionTypes;
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import * as Client from '../utils/client.jsx';
+import ModalStore from '../stores/modal_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import TeamStore from '../stores/team_store.jsx';
+import ConfirmModal from './confirm_modal.jsx';
 
 const Modal = ReactBootstrap.Modal;
 
diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 7f8820d9f..d87bd20ad 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
-const Client = require('../utils/client.jsx');
-const UserStore = require('../stores/user_store.jsx');
-const BrowserStore = require('../stores/browser_store.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as Client from '../utils/client.jsx';
+import UserStore from '../stores/user_store.jsx';
+import BrowserStore from '../stores/browser_store.jsx';
 
 export default class Login extends React.Component {
     constructor(props) {
diff --git a/web/react/components/member_list.jsx b/web/react/components/member_list.jsx
index 0238c7920..8c6dc4209 100644
--- a/web/react/components/member_list.jsx
+++ b/web/react/components/member_list.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var MemberListItem = require('./member_list_item.jsx');
+import MemberListItem from './member_list_item.jsx';
 
 export default class MemberList extends React.Component {
     constructor(props) {
diff --git a/web/react/components/member_list_item.jsx b/web/react/components/member_list_item.jsx
index 8251d67bc..390d25f2e 100644
--- a/web/react/components/member_list_item.jsx
+++ b/web/react/components/member_list_item.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
-const Utils = require('../utils/utils.jsx');
+import UserStore from '../stores/user_store.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 export default class MemberListItem extends React.Component {
     constructor(props) {
diff --git a/web/react/components/member_list_team.jsx b/web/react/components/member_list_team.jsx
index cb2d0660b..72fdb7be9 100644
--- a/web/react/components/member_list_team.jsx
+++ b/web/react/components/member_list_team.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const MemberListTeamItem = require('./member_list_team_item.jsx');
+import MemberListTeamItem from './member_list_team_item.jsx';
 
 export default class MemberListTeam extends React.Component {
     render() {
diff --git a/web/react/components/member_list_team_item.jsx b/web/react/components/member_list_team_item.jsx
index 1fa369068..27fb6a4c1 100644
--- a/web/react/components/member_list_team_item.jsx
+++ b/web/react/components/member_list_team_item.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const UserStore = require('../stores/user_store.jsx');
-const Client = require('../utils/client.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
-const Utils = require('../utils/utils.jsx');
+import UserStore from '../stores/user_store.jsx';
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 export default class MemberListTeamItem extends React.Component {
     constructor(props) {
diff --git a/web/react/components/mention.jsx b/web/react/components/mention.jsx
index 050887c6f..44f6210e4 100644
--- a/web/react/components/mention.jsx
+++ b/web/react/components/mention.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
-var UserStore = require('../stores/user_store.jsx');
-const Utils = require('../utils/utils.jsx');
+import UserStore from '../stores/user_store.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 export default class Mention extends React.Component {
     constructor(props) {
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index 61a24c09c..d1b27cf99 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -1,13 +1,13 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
-var SearchStore = require('../stores/search_store.jsx');
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var Mention = require('./mention.jsx');
+import UserStore from '../stores/user_store.jsx';
+import SearchStore from '../stores/search_store.jsx';
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import Mention from './mention.jsx';
 
-var Constants = require('../utils/constants.jsx');
-var Utils = require('../utils/utils.jsx');
+import Constants from '../utils/constants.jsx';
+import * as Utils from '../utils/utils.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 var MAX_HEIGHT_LIST = 292;
diff --git a/web/react/components/message_wrapper.jsx b/web/react/components/message_wrapper.jsx
index 00c427c79..8e0380c06 100644
--- a/web/react/components/message_wrapper.jsx
+++ b/web/react/components/message_wrapper.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var TextFormatting = require('../utils/text_formatting.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
 
 export default class MessageWrapper extends React.Component {
     constructor(props) {
diff --git a/web/react/components/more_channels.jsx b/web/react/components/more_channels.jsx
index 8a6dd84a4..29512b9b7 100644
--- a/web/react/components/more_channels.jsx
+++ b/web/react/components/more_channels.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
-var client = require('../utils/client.jsx');
-var asyncClient = require('../utils/async_client.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var LoadingScreen = require('./loading_screen.jsx');
-var NewChannelFlow = require('./new_channel_flow.jsx');
+import * as utils from '../utils/utils.jsx';
+import * as client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import LoadingScreen from './loading_screen.jsx';
+import NewChannelFlow from './new_channel_flow.jsx';
 
 function getStateFromStores() {
     return {
@@ -31,12 +31,12 @@ export default class MoreChannels extends React.Component {
     }
     componentDidMount() {
         ChannelStore.addMoreChangeListener(this.onListenerChange);
-        $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', function shown() {
-            asyncClient.getMoreChannels(true);
+        $(ReactDOM.findDOMNode(this.refs.modal)).on('shown.bs.modal', () => {
+            AsyncClient.getMoreChannels(true);
         });
 
         var self = this;
-        $(ReactDOM.findDOMNode(this.refs.modal)).on('show.bs.modal', function show(e) {
+        $(ReactDOM.findDOMNode(this.refs.modal)).on('show.bs.modal', (e) => {
             var button = e.relatedTarget;
             self.setState({channelType: $(button).attr('data-channeltype')});
         });
@@ -53,15 +53,15 @@ export default class MoreChannels extends React.Component {
     handleJoin(channel, channelIndex) {
         this.setState({joiningChannel: channelIndex});
         client.joinChannel(channel.id,
-            function joinSuccess() {
+            () => {
                 $(ReactDOM.findDOMNode(this.refs.modal)).modal('hide');
-                asyncClient.getChannel(channel.id);
+                AsyncClient.getChannel(channel.id);
                 utils.switchChannel(channel);
                 this.setState({joiningChannel: -1});
-            }.bind(this),
-            function joinFail(err) {
+            },
+            (err) => {
                 this.setState({joiningChannel: -1, serverError: err.message});
-            }.bind(this)
+            }
         );
     }
     handleNewChannel() {
diff --git a/web/react/components/more_direct_channels.jsx b/web/react/components/more_direct_channels.jsx
index d1265f67e..9116dc8f1 100644
--- a/web/react/components/more_direct_channels.jsx
+++ b/web/react/components/more_direct_channels.jsx
@@ -2,8 +2,8 @@
 // See License.txt for license information.
 
 const Modal = ReactBootstrap.Modal;
-const UserStore = require('../stores/user_store.jsx');
-const Utils = require('../utils/utils.jsx');
+import UserStore from '../stores/user_store.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 export default class MoreDirectChannels extends React.Component {
     constructor(props) {
diff --git a/web/react/components/msg_typing.jsx b/web/react/components/msg_typing.jsx
index ccf8a2445..78b67a216 100644
--- a/web/react/components/msg_typing.jsx
+++ b/web/react/components/msg_typing.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const SocketStore = require('../stores/socket_store.jsx');
-const UserStore = require('../stores/user_store.jsx');
+import SocketStore from '../stores/socket_store.jsx';
+import UserStore from '../stores/user_store.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const SocketEvents = Constants.SocketEvents;
 
 export default class MsgTyping extends React.Component {
@@ -74,11 +74,12 @@ export default class MsgTyping extends React.Component {
         case 1:
             text = users[0] + ' is typing...';
             break;
-        default:
+        default: {
             const last = users.pop();
             text = users.join(', ') + ' and ' + last + ' are typing...';
             break;
         }
+        }
 
         this.setState({text});
     }
diff --git a/web/react/components/navbar.jsx b/web/react/components/navbar.jsx
index 845c33f3b..6848ee5da 100644
--- a/web/react/components/navbar.jsx
+++ b/web/react/components/navbar.jsx
@@ -1,27 +1,27 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const EditChannelPurposeModal = require('./edit_channel_purpose_modal.jsx');
-const MessageWrapper = require('./message_wrapper.jsx');
-const NotifyCounts = require('./notify_counts.jsx');
-const ChannelMembersModal = require('./channel_members_modal.jsx');
-const ChannelInfoModal = require('./channel_info_modal.jsx');
-const ChannelInviteModal = require('./channel_invite_modal.jsx');
-const ChannelNotificationsModal = require('./channel_notifications_modal.jsx');
-const DeleteChannelModal = require('./delete_channel_modal.jsx');
-const ToggleModalButton = require('./toggle_modal_button.jsx');
+import EditChannelPurposeModal from './edit_channel_purpose_modal.jsx';
+import MessageWrapper from './message_wrapper.jsx';
+import NotifyCounts from './notify_counts.jsx';
+import ChannelMembersModal from './channel_members_modal.jsx';
+import ChannelInfoModal from './channel_info_modal.jsx';
+import ChannelInviteModal from './channel_invite_modal.jsx';
+import ChannelNotificationsModal from './channel_notifications_modal.jsx';
+import DeleteChannelModal from './delete_channel_modal.jsx';
+import ToggleModalButton from './toggle_modal_button.jsx';
 
-const UserStore = require('../stores/user_store.jsx');
-const ChannelStore = require('../stores/channel_store.jsx');
-const TeamStore = require('../stores/team_store.jsx');
+import UserStore from '../stores/user_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import TeamStore from '../stores/team_store.jsx';
 
-const Client = require('../utils/client.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
-const Utils = require('../utils/utils.jsx');
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import * as Utils from '../utils/utils.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
 
 const Popover = ReactBootstrap.Popover;
 const OverlayTrigger = ReactBootstrap.OverlayTrigger;
diff --git a/web/react/components/navbar_dropdown.jsx b/web/react/components/navbar_dropdown.jsx
index cf9db055d..c0230fe5f 100644
--- a/web/react/components/navbar_dropdown.jsx
+++ b/web/react/components/navbar_dropdown.jsx
@@ -1,16 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
-var client = require('../utils/client.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var TeamStore = require('../stores/team_store.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as client from '../utils/client.jsx';
+import UserStore from '../stores/user_store.jsx';
+import TeamStore from '../stores/team_store.jsx';
 
-var AboutBuildModal = require('./about_build_modal.jsx');
-var InviteMemberModal = require('./invite_member_modal.jsx');
-var UserSettingsModal = require('./user_settings/user_settings_modal.jsx');
+import AboutBuildModal from './about_build_modal.jsx';
+import InviteMemberModal from './invite_member_modal.jsx';
+import UserSettingsModal from './user_settings/user_settings_modal.jsx';
 
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 
 function getStateFromStores() {
     const teams = [];
diff --git a/web/react/components/new_channel_flow.jsx b/web/react/components/new_channel_flow.jsx
index d6280d118..3a114aa19 100644
--- a/web/react/components/new_channel_flow.jsx
+++ b/web/react/components/new_channel_flow.jsx
@@ -1,13 +1,13 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
-var AsyncClient = require('../utils/async_client.jsx');
-var Client = require('../utils/client.jsx');
-var UserStore = require('../stores/user_store.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import * as Client from '../utils/client.jsx';
+import UserStore from '../stores/user_store.jsx';
 
-var NewChannelModal = require('./new_channel_modal.jsx');
-var ChangeURLModal = require('./change_url_modal.jsx');
+import NewChannelModal from './new_channel_modal.jsx';
+import ChangeURLModal from './change_url_modal.jsx';
 
 const SHOW_NEW_CHANNEL = 1;
 const SHOW_EDIT_URL = 2;
diff --git a/web/react/components/new_channel_modal.jsx b/web/react/components/new_channel_modal.jsx
index 2c044cd5d..70fe10eef 100644
--- a/web/react/components/new_channel_modal.jsx
+++ b/web/react/components/new_channel_modal.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 var Modal = ReactBootstrap.Modal;
 
 export default class NewChannelModal extends React.Component {
diff --git a/web/react/components/notify_counts.jsx b/web/react/components/notify_counts.jsx
index 0a4f60989..19b81556b 100644
--- a/web/react/components/notify_counts.jsx
+++ b/web/react/components/notify_counts.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
+import * as utils from '../utils/utils.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
 
 function getCountsStateFromStores() {
     var count = 0;
diff --git a/web/react/components/password_reset.jsx b/web/react/components/password_reset.jsx
index 54d126144..4c9bb6310 100644
--- a/web/react/components/password_reset.jsx
+++ b/web/react/components/password_reset.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PasswordResetSendLink = require('./password_reset_send_link.jsx');
-var PasswordResetForm = require('./password_reset_form.jsx');
+import PasswordResetSendLink from './password_reset_send_link.jsx';
+import PasswordResetForm from './password_reset_form.jsx';
 
 export default class PasswordReset extends React.Component {
     constructor(props) {
diff --git a/web/react/components/password_reset_form.jsx b/web/react/components/password_reset_form.jsx
index b452c40b7..812911569 100644
--- a/web/react/components/password_reset_form.jsx
+++ b/web/react/components/password_reset_form.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var client = require('../utils/client.jsx');
+import * as client from '../utils/client.jsx';
 
 export default class PasswordResetForm extends React.Component {
     constructor(props) {
diff --git a/web/react/components/password_reset_send_link.jsx b/web/react/components/password_reset_send_link.jsx
index 8f1890705..051b8b02c 100644
--- a/web/react/components/password_reset_send_link.jsx
+++ b/web/react/components/password_reset_send_link.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
-var client = require('../utils/client.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as client from '../utils/client.jsx';
 
 export default class PasswordResetSendLink extends React.Component {
     constructor(props) {
diff --git a/web/react/components/popover_list_members.jsx b/web/react/components/popover_list_members.jsx
index 102bddcf5..b5000141a 100644
--- a/web/react/components/popover_list_members.jsx
+++ b/web/react/components/popover_list_members.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
+import UserStore from '../stores/user_store.jsx';
 var Popover = ReactBootstrap.Popover;
 var Overlay = ReactBootstrap.Overlay;
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
-const ChannelStore = require('../stores/channel_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
 
 export default class PopoverListMembers extends React.Component {
     constructor(props) {
diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index 7e4af07c4..5b61c711c 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -1,17 +1,17 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PostHeader = require('./post_header.jsx');
-var PostBody = require('./post_body.jsx');
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var Constants = require('../utils/constants.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var PostStore = require('../stores/post_store.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var client = require('../utils/client.jsx');
-var AsyncClient = require('../utils/async_client.jsx');
+import PostHeader from './post_header.jsx';
+import PostBody from './post_body.jsx';
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import Constants from '../utils/constants.jsx';
+import UserStore from '../stores/user_store.jsx';
+import PostStore from '../stores/post_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import * as client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
 var ActionTypes = Constants.ActionTypes;
-var utils = require('../utils/utils.jsx');
+import * as utils from '../utils/utils.jsx';
 
 export default class Post extends React.Component {
     constructor(props) {
diff --git a/web/react/components/post_attachment.jsx b/web/react/components/post_attachment.jsx
index cf65dfbfb..676bc91af 100644
--- a/web/react/components/post_attachment.jsx
+++ b/web/react/components/post_attachment.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const TextFormatting = require('../utils/text_formatting.jsx');
+import * as TextFormatting from '../utils/text_formatting.jsx';
 
 export default class PostAttachment extends React.Component {
     constructor(props) {
diff --git a/web/react/components/post_attachment_list.jsx b/web/react/components/post_attachment_list.jsx
index 03b866656..9c6700e2d 100644
--- a/web/react/components/post_attachment_list.jsx
+++ b/web/react/components/post_attachment_list.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const PostAttachment = require('./post_attachment.jsx');
+import PostAttachment from './post_attachment.jsx';
 
 export default class PostAttachmentList extends React.Component {
     constructor(props) {
diff --git a/web/react/components/post_body.jsx b/web/react/components/post_body.jsx
index e1c057775..de8195f91 100644
--- a/web/react/components/post_body.jsx
+++ b/web/react/components/post_body.jsx
@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const FileAttachmentList = require('./file_attachment_list.jsx');
-const UserStore = require('../stores/user_store.jsx');
-const Utils = require('../utils/utils.jsx');
-const Constants = require('../utils/constants.jsx');
-const TextFormatting = require('../utils/text_formatting.jsx');
-const twemoji = require('twemoji');
-const PostBodyAdditionalContent = require('./post_body_additional_content.jsx');
-
-const providers = require('./providers.json');
+import FileAttachmentList from './file_attachment_list.jsx';
+import UserStore from '../stores/user_store.jsx';
+import * as Utils from '../utils/utils.jsx';
+import Constants from '../utils/constants.jsx';
+import * as TextFormatting from '../utils/text_formatting.jsx';
+import twemoji from 'twemoji';
+import PostBodyAdditionalContent from './post_body_additional_content.jsx';
+
+import providers from './providers.json';
 
 export default class PostBody extends React.Component {
     constructor(props) {
diff --git a/web/react/components/post_body_additional_content.jsx b/web/react/components/post_body_additional_content.jsx
index 0c2c44286..e19bf51eb 100644
--- a/web/react/components/post_body_additional_content.jsx
+++ b/web/react/components/post_body_additional_content.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const PostAttachmentList = require('./post_attachment_list.jsx');
-const PostAttachmentOEmbed = require('./post_attachment_oembed.jsx');
+import PostAttachmentList from './post_attachment_list.jsx';
+import PostAttachmentOEmbed from './post_attachment_oembed.jsx';
 
 export default class PostBodyAdditionalContent extends React.Component {
     constructor(props) {
diff --git a/web/react/components/post_deleted_modal.jsx b/web/react/components/post_deleted_modal.jsx
index ba07a22f5..3723bcaba 100644
--- a/web/react/components/post_deleted_modal.jsx
+++ b/web/react/components/post_deleted_modal.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var Constants = require('../utils/constants.jsx');
+import UserStore from '../stores/user_store.jsx';
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 export default class PostDeletedModal extends React.Component {
diff --git a/web/react/components/post_header.jsx b/web/react/components/post_header.jsx
index e8b162fc2..ffc32f82c 100644
--- a/web/react/components/post_header.jsx
+++ b/web/react/components/post_header.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserProfile = require('./user_profile.jsx');
-var PostInfo = require('./post_info.jsx');
+import UserProfile from './user_profile.jsx';
+import PostInfo from './post_info.jsx';
 
 export default class PostHeader extends React.Component {
     constructor(props) {
diff --git a/web/react/components/post_info.jsx b/web/react/components/post_info.jsx
index 322834f07..5306edd3d 100644
--- a/web/react/components/post_info.jsx
+++ b/web/react/components/post_info.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var DeletePostModal = require('./delete_post_modal.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var utils = require('../utils/utils.jsx');
-var TimeSince = require('./time_since.jsx');
+import DeletePostModal from './delete_post_modal.jsx';
+import UserStore from '../stores/user_store.jsx';
+import * as utils from '../utils/utils.jsx';
+import TimeSince from './time_since.jsx';
 
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 
 export default class PostInfo extends React.Component {
     constructor(props) {
diff --git a/web/react/components/posts_view.jsx b/web/react/components/posts_view.jsx
index ec8223203..5b36ecbc5 100644
--- a/web/react/components/posts_view.jsx
+++ b/web/react/components/posts_view.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const UserStore = require('../stores/user_store.jsx');
-const Utils = require('../utils/utils.jsx');
-const Post = require('./post.jsx');
-const Constants = require('../utils/constants.jsx');
+import UserStore from '../stores/user_store.jsx';
+import * as Utils from '../utils/utils.jsx';
+import Post from './post.jsx';
+import Constants from '../utils/constants.jsx';
 
 export default class PostsView extends React.Component {
     constructor(props) {
diff --git a/web/react/components/posts_view_container.jsx b/web/react/components/posts_view_container.jsx
index 2cb56cd47..c71ef401e 100644
--- a/web/react/components/posts_view_container.jsx
+++ b/web/react/components/posts_view_container.jsx
@@ -1,19 +1,19 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const PostsView = require('./posts_view.jsx');
-const LoadingScreen = require('./loading_screen.jsx');
-const ChannelInviteModal = require('./channel_invite_modal.jsx');
+import PostsView from './posts_view.jsx';
+import LoadingScreen from './loading_screen.jsx';
+import ChannelInviteModal from './channel_invite_modal.jsx';
 
-const ChannelStore = require('../stores/channel_store.jsx');
-const PostStore = require('../stores/post_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
+import PostStore from '../stores/post_store.jsx';
 
-const Utils = require('../utils/utils.jsx');
-const Client = require('../utils/client.jsx');
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as Client from '../utils/client.jsx';
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 
 import {createChannelIntroMessage} from '../utils/channel_intro_mssages.jsx';
diff --git a/web/react/components/register_app_modal.jsx b/web/react/components/register_app_modal.jsx
index c40409dcc..100600c4b 100644
--- a/web/react/components/register_app_modal.jsx
+++ b/web/react/components/register_app_modal.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
 
 export default class RegisterAppModal extends React.Component {
     constructor() {
diff --git a/web/react/components/removed_from_channel_modal.jsx b/web/react/components/removed_from_channel_modal.jsx
index 7cf0a2ef1..69d038c22 100644
--- a/web/react/components/removed_from_channel_modal.jsx
+++ b/web/react/components/removed_from_channel_modal.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var ChannelStore = require('../stores/channel_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var BrowserStore = require('../stores/browser_store.jsx');
-var utils = require('../utils/utils.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import BrowserStore from '../stores/browser_store.jsx';
+import * as utils from '../utils/utils.jsx';
 
 export default class RemovedFromChannelModal extends React.Component {
     constructor(props) {
diff --git a/web/react/components/rename_channel_modal.jsx b/web/react/components/rename_channel_modal.jsx
index f47009cce..c16216c68 100644
--- a/web/react/components/rename_channel_modal.jsx
+++ b/web/react/components/rename_channel_modal.jsx
@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
-const Client = require('../utils/client.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
-const ChannelStore = require('../stores/channel_store.jsx');
-const Constants = require('../utils/constants.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import Constants from '../utils/constants.jsx';
 
 export default class RenameChannelModal extends React.Component {
     constructor(props) {
diff --git a/web/react/components/rhs_comment.jsx b/web/react/components/rhs_comment.jsx
index a55bf0039..3e555c85a 100644
--- a/web/react/components/rhs_comment.jsx
+++ b/web/react/components/rhs_comment.jsx
@@ -1,20 +1,20 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PostStore = require('../stores/post_store.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var UserProfile = require('./user_profile.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var Utils = require('../utils/utils.jsx');
-var Constants = require('../utils/constants.jsx');
-var DeletePostModal = require('./delete_post_modal.jsx');
-var FileAttachmentList = require('./file_attachment_list.jsx');
-var Client = require('../utils/client.jsx');
-var AsyncClient = require('../utils/async_client.jsx');
+import PostStore from '../stores/post_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import UserProfile from './user_profile.jsx';
+import UserStore from '../stores/user_store.jsx';
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import * as Utils from '../utils/utils.jsx';
+import Constants from '../utils/constants.jsx';
+import DeletePostModal from './delete_post_modal.jsx';
+import FileAttachmentList from './file_attachment_list.jsx';
+import * as Client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
 var ActionTypes = Constants.ActionTypes;
-var TextFormatting = require('../utils/text_formatting.jsx');
-var twemoji = require('twemoji');
+import * as TextFormatting from '../utils/text_formatting.jsx';
+import twemoji from 'twemoji';
 
 export default class RhsComment extends React.Component {
     constructor(props) {
diff --git a/web/react/components/rhs_header_post.jsx b/web/react/components/rhs_header_post.jsx
index 856eea91d..990b33eb5 100644
--- a/web/react/components/rhs_header_post.jsx
+++ b/web/react/components/rhs_header_post.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-const Constants = require('../utils/constants.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 
 export default class RhsHeaderPost extends React.Component {
diff --git a/web/react/components/rhs_root_post.jsx b/web/react/components/rhs_root_post.jsx
index 358bf8440..96f43bdb5 100644
--- a/web/react/components/rhs_root_post.jsx
+++ b/web/react/components/rhs_root_post.jsx
@@ -1,16 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var ChannelStore = require('../stores/channel_store.jsx');
-var UserProfile = require('./user_profile.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var TextFormatting = require('../utils/text_formatting.jsx');
-var utils = require('../utils/utils.jsx');
-var DeletePostModal = require('./delete_post_modal.jsx');
-var FileAttachmentList = require('./file_attachment_list.jsx');
-var twemoji = require('twemoji');
-var Constants = require('../utils/constants.jsx');
-const PostBodyAdditionalContent = require('./post_body_additional_content.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
+import UserProfile from './user_profile.jsx';
+import UserStore from '../stores/user_store.jsx';
+import * as TextFormatting from '../utils/text_formatting.jsx';
+import * as utils from '../utils/utils.jsx';
+import DeletePostModal from './delete_post_modal.jsx';
+import FileAttachmentList from './file_attachment_list.jsx';
+import twemoji from 'twemoji';
+import Constants from '../utils/constants.jsx';
+import PostBodyAdditionalContent from './post_body_additional_content.jsx';
 
 export default class RhsRootPost extends React.Component {
     constructor(props) {
diff --git a/web/react/components/rhs_thread.jsx b/web/react/components/rhs_thread.jsx
index cc062c538..4f453f76b 100644
--- a/web/react/components/rhs_thread.jsx
+++ b/web/react/components/rhs_thread.jsx
@@ -1,17 +1,17 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PostStore = require('../stores/post_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var PreferenceStore = require('../stores/preference_store.jsx');
-var Utils = require('../utils/utils.jsx');
-var SearchBox = require('./search_bar.jsx');
-var CreateComment = require('./create_comment.jsx');
-var RhsHeaderPost = require('./rhs_header_post.jsx');
-var RootPost = require('./rhs_root_post.jsx');
-var Comment = require('./rhs_comment.jsx');
-var Constants = require('../utils/constants.jsx');
-var FileUploadOverlay = require('./file_upload_overlay.jsx');
+import PostStore from '../stores/post_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import PreferenceStore from '../stores/preference_store.jsx';
+import * as Utils from '../utils/utils.jsx';
+import SearchBox from './search_bar.jsx';
+import CreateComment from './create_comment.jsx';
+import RhsHeaderPost from './rhs_header_post.jsx';
+import RootPost from './rhs_root_post.jsx';
+import Comment from './rhs_comment.jsx';
+import Constants from '../utils/constants.jsx';
+import FileUploadOverlay from './file_upload_overlay.jsx';
 
 export default class RhsThread extends React.Component {
     constructor(props) {
diff --git a/web/react/components/search_autocomplete.jsx b/web/react/components/search_autocomplete.jsx
index 04384203f..4c0aa0166 100644
--- a/web/react/components/search_autocomplete.jsx
+++ b/web/react/components/search_autocomplete.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const ChannelStore = require('../stores/channel_store.jsx');
-const KeyCodes = require('../utils/constants.jsx').KeyCodes;
+import ChannelStore from '../stores/channel_store.jsx';
+import Constants from '../utils/constants.jsx';
+const KeyCodes = Constants.KeyCodes;
 const Popover = ReactBootstrap.Popover;
-const UserStore = require('../stores/user_store.jsx');
-const Utils = require('../utils/utils.jsx');
-const Constants = require('../utils/constants.jsx');
+import UserStore from '../stores/user_store.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 const patterns = new Map([
     ['channels', /\b(?:in|channel):\s*(\S*)$/i],
diff --git a/web/react/components/search_bar.jsx b/web/react/components/search_bar.jsx
index 0f749f2cf..32f0f93bf 100644
--- a/web/react/components/search_bar.jsx
+++ b/web/react/components/search_bar.jsx
@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var client = require('../utils/client.jsx');
-var AsyncClient = require('../utils/async_client.jsx');
-var SearchStore = require('../stores/search_store.jsx');
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var utils = require('../utils/utils.jsx');
-var Constants = require('../utils/constants.jsx');
+import * as client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import SearchStore from '../stores/search_store.jsx';
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import * as utils from '../utils/utils.jsx';
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 var Popover = ReactBootstrap.Popover;
-var SearchAutocomplete = require('./search_autocomplete.jsx');
+import SearchAutocomplete from './search_autocomplete.jsx';
 
 export default class SearchBar extends React.Component {
     constructor() {
diff --git a/web/react/components/search_results.jsx b/web/react/components/search_results.jsx
index 491995087..141181701 100644
--- a/web/react/components/search_results.jsx
+++ b/web/react/components/search_results.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SearchStore = require('../stores/search_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var SearchBox = require('./search_bar.jsx');
-var Utils = require('../utils/utils.jsx');
-var SearchResultsHeader = require('./search_results_header.jsx');
-var SearchResultsItem = require('./search_results_item.jsx');
+import SearchStore from '../stores/search_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import SearchBox from './search_bar.jsx';
+import * as Utils from '../utils/utils.jsx';
+import SearchResultsHeader from './search_results_header.jsx';
+import SearchResultsItem from './search_results_item.jsx';
 
 function getStateFromStores() {
     return {results: SearchStore.getSearchResults()};
diff --git a/web/react/components/search_results_header.jsx b/web/react/components/search_results_header.jsx
index fdd449c2d..581976494 100644
--- a/web/react/components/search_results_header.jsx
+++ b/web/react/components/search_results_header.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var Constants = require('../utils/constants.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 export default class SearchResultsHeader extends React.Component {
diff --git a/web/react/components/search_results_item.jsx b/web/react/components/search_results_item.jsx
index 52766a8a0..2202831a3 100644
--- a/web/react/components/search_results_item.jsx
+++ b/web/react/components/search_results_item.jsx
@@ -1,16 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SearchStore = require('../stores/search_store.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var UserProfile = require('./user_profile.jsx');
-var utils = require('../utils/utils.jsx');
-var client = require('../utils/client.jsx');
-var AsyncClient = require('../utils/async_client.jsx');
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var Constants = require('../utils/constants.jsx');
-var TextFormatting = require('../utils/text_formatting.jsx');
+import SearchStore from '../stores/search_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import UserProfile from './user_profile.jsx';
+import * as utils from '../utils/utils.jsx';
+import * as client from '../utils/client.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import Constants from '../utils/constants.jsx';
+import * as TextFormatting from '../utils/text_formatting.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 export default class SearchResultsItem extends React.Component {
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 542f433f3..77d222436 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -1,23 +1,23 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const NewChannelFlow = require('./new_channel_flow.jsx');
-const MoreDirectChannels = require('./more_direct_channels.jsx');
-const SearchBox = require('./search_bar.jsx');
-const SidebarHeader = require('./sidebar_header.jsx');
-const UnreadChannelIndicator = require('./unread_channel_indicator.jsx');
-const TutorialTip = require('./tutorial/tutorial_tip.jsx');
-
-const ChannelStore = require('../stores/channel_store.jsx');
-const UserStore = require('../stores/user_store.jsx');
-const TeamStore = require('../stores/team_store.jsx');
-const PreferenceStore = require('../stores/preference_store.jsx');
-
-const AsyncClient = require('../utils/async_client.jsx');
-const Client = require('../utils/client.jsx');
-const Utils = require('../utils/utils.jsx');
-
-const Constants = require('../utils/constants.jsx');
+import NewChannelFlow from './new_channel_flow.jsx';
+import MoreDirectChannels from './more_direct_channels.jsx';
+import SearchBox from './search_bar.jsx';
+import SidebarHeader from './sidebar_header.jsx';
+import UnreadChannelIndicator from './unread_channel_indicator.jsx';
+import TutorialTip from './tutorial/tutorial_tip.jsx';
+
+import ChannelStore from '../stores/channel_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import TeamStore from '../stores/team_store.jsx';
+import PreferenceStore from '../stores/preference_store.jsx';
+
+import * as AsyncClient from '../utils/async_client.jsx';
+import * as Client from '../utils/client.jsx';
+import * as Utils from '../utils/utils.jsx';
+
+import Constants from '../utils/constants.jsx';
 const Preferences = Constants.Preferences;
 const TutorialSteps = Constants.TutorialSteps;
 const NotificationPrefs = Constants.NotificationPrefs;
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index bc7f6ba50..20f4fd511 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -1,14 +1,14 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const NavbarDropdown = require('./navbar_dropdown.jsx');
-const TutorialTip = require('./tutorial/tutorial_tip.jsx');
+import NavbarDropdown from './navbar_dropdown.jsx';
+import TutorialTip from './tutorial/tutorial_tip.jsx';
 
-const UserStore = require('../stores/user_store.jsx');
-const PreferenceStore = require('../stores/preference_store.jsx');
+import UserStore from '../stores/user_store.jsx';
+import PreferenceStore from '../stores/preference_store.jsx';
 
-const Utils = require('../utils/utils.jsx');
-const Constants = require('../utils/constants.jsx');
+import * as Utils from '../utils/utils.jsx';
+import Constants from '../utils/constants.jsx';
 const Preferences = Constants.Preferences;
 const TutorialSteps = Constants.TutorialSteps;
 
diff --git a/web/react/components/sidebar_right.jsx b/web/react/components/sidebar_right.jsx
index 8d16057fc..22d702369 100644
--- a/web/react/components/sidebar_right.jsx
+++ b/web/react/components/sidebar_right.jsx
@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SearchResults = require('./search_results.jsx');
-var RhsThread = require('./rhs_thread.jsx');
-var SearchStore = require('../stores/search_store.jsx');
-var PostStore = require('../stores/post_store.jsx');
-var Utils = require('../utils/utils.jsx');
+import SearchResults from './search_results.jsx';
+import RhsThread from './rhs_thread.jsx';
+import SearchStore from '../stores/search_store.jsx';
+import PostStore from '../stores/post_store.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 export default class SidebarRight extends React.Component {
     constructor(props) {
diff --git a/web/react/components/sidebar_right_menu.jsx b/web/react/components/sidebar_right_menu.jsx
index 6a428e884..f6c0c8adb 100644
--- a/web/react/components/sidebar_right_menu.jsx
+++ b/web/react/components/sidebar_right_menu.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var InviteMemberModal = require('./invite_member_modal.jsx');
-var UserSettingsModal = require('./user_settings/user_settings_modal.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var TeamStore = require('../stores/team_store.jsx');
-var client = require('../utils/client.jsx');
-var utils = require('../utils/utils.jsx');
+import InviteMemberModal from './invite_member_modal.jsx';
+import UserSettingsModal from './user_settings/user_settings_modal.jsx';
+import UserStore from '../stores/user_store.jsx';
+import TeamStore from '../stores/team_store.jsx';
+import * as client from '../utils/client.jsx';
+import * as utils from '../utils/utils.jsx';
 
 export default class SidebarRightMenu extends React.Component {
     componentDidMount() {
diff --git a/web/react/components/signup_team.jsx b/web/react/components/signup_team.jsx
index 516765a3f..0ac837326 100644
--- a/web/react/components/signup_team.jsx
+++ b/web/react/components/signup_team.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const ChoosePage = require('./team_signup_choose_auth.jsx');
-const EmailSignUpPage = require('./team_signup_with_email.jsx');
-const SSOSignupPage = require('./team_signup_with_sso.jsx');
-const Constants = require('../utils/constants.jsx');
+import ChoosePage from './team_signup_choose_auth.jsx';
+import EmailSignUpPage from './team_signup_with_email.jsx';
+import SSOSignupPage from './team_signup_with_sso.jsx';
+import Constants from '../utils/constants.jsx';
 
 export default class TeamSignUp extends React.Component {
     constructor(props) {
diff --git a/web/react/components/signup_team_complete.jsx b/web/react/components/signup_team_complete.jsx
index c30132885..6c7fd57b3 100644
--- a/web/react/components/signup_team_complete.jsx
+++ b/web/react/components/signup_team_complete.jsx
@@ -1,13 +1,13 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var WelcomePage = require('./team_signup_welcome_page.jsx');
-var TeamDisplayNamePage = require('./team_signup_display_name_page.jsx');
-var TeamURLPage = require('./team_signup_url_page.jsx');
-var SendInivtesPage = require('./team_signup_send_invites_page.jsx');
-var UsernamePage = require('./team_signup_username_page.jsx');
-var PasswordPage = require('./team_signup_password_page.jsx');
-var BrowserStore = require('../stores/browser_store.jsx');
+import WelcomePage from './team_signup_welcome_page.jsx';
+import TeamDisplayNamePage from './team_signup_display_name_page.jsx';
+import TeamURLPage from './team_signup_url_page.jsx';
+import SendInivtesPage from './team_signup_send_invites_page.jsx';
+import UsernamePage from './team_signup_username_page.jsx';
+import PasswordPage from './team_signup_password_page.jsx';
+import BrowserStore from '../stores/browser_store.jsx';
 
 export default class SignupTeamComplete extends React.Component {
     constructor(props) {
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index d70ea5065..2bde78726 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
-var client = require('../utils/client.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var BrowserStore = require('../stores/browser_store.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as client from '../utils/client.jsx';
+import UserStore from '../stores/user_store.jsx';
+import BrowserStore from '../stores/browser_store.jsx';
 
 export default class SignupUserComplete extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_export_tab.jsx b/web/react/components/team_export_tab.jsx
index e15e3a372..14df7fffc 100644
--- a/web/react/components/team_export_tab.jsx
+++ b/web/react/components/team_export_tab.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
+import * as Client from '../utils/client.jsx';
 
 export default class TeamExportTab extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_general_tab.jsx b/web/react/components/team_general_tab.jsx
index a50859489..795fad671 100644
--- a/web/react/components/team_general_tab.jsx
+++ b/web/react/components/team_general_tab.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const SettingItemMin = require('./setting_item_min.jsx');
-const SettingItemMax = require('./setting_item_max.jsx');
+import SettingItemMin from './setting_item_min.jsx';
+import SettingItemMax from './setting_item_max.jsx';
 
-const Client = require('../utils/client.jsx');
-const Utils = require('../utils/utils.jsx');
-const TeamStore = require('../stores/team_store.jsx');
+import * as Client from '../utils/client.jsx';
+import * as Utils from '../utils/utils.jsx';
+import TeamStore from '../stores/team_store.jsx';
 
 export default class GeneralTab extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_import_tab.jsx b/web/react/components/team_import_tab.jsx
index a80b1a472..37f8746d7 100644
--- a/web/react/components/team_import_tab.jsx
+++ b/web/react/components/team_import_tab.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
-var SettingUpload = require('./setting_upload.jsx');
+import * as utils from '../utils/utils.jsx';
+import SettingUpload from './setting_upload.jsx';
 
 export default class TeamImportTab extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_members.jsx b/web/react/components/team_members.jsx
index afe7f46ec..cd0766012 100644
--- a/web/react/components/team_members.jsx
+++ b/web/react/components/team_members.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../stores/user_store.jsx');
-var MemberListTeam = require('./member_list_team.jsx');
-var utils = require('../utils/utils.jsx');
+import UserStore from '../stores/user_store.jsx';
+import MemberListTeam from './member_list_team.jsx';
+import * as utils from '../utils/utils.jsx';
 
 function getStateFromStores() {
     var users = UserStore.getProfiles();
diff --git a/web/react/components/team_settings.jsx b/web/react/components/team_settings.jsx
index 862f3c528..bbcedb5dd 100644
--- a/web/react/components/team_settings.jsx
+++ b/web/react/components/team_settings.jsx
@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var TeamStore = require('../stores/team_store.jsx');
-var ImportTab = require('./team_import_tab.jsx');
-var ExportTab = require('./team_export_tab.jsx');
-var GeneralTab = require('./team_general_tab.jsx');
-var Utils = require('../utils/utils.jsx');
+import TeamStore from '../stores/team_store.jsx';
+import ImportTab from './team_import_tab.jsx';
+import ExportTab from './team_export_tab.jsx';
+import GeneralTab from './team_general_tab.jsx';
+import * as Utils from '../utils/utils.jsx';
 
 export default class TeamSettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_settings_modal.jsx b/web/react/components/team_settings_modal.jsx
index 4d47db2a8..dbdbde958 100644
--- a/web/react/components/team_settings_modal.jsx
+++ b/web/react/components/team_settings_modal.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const SettingsSidebar = require('./settings_sidebar.jsx');
-const TeamSettings = require('./team_settings.jsx');
+import SettingsSidebar from './settings_sidebar.jsx';
+import TeamSettings from './team_settings.jsx';
 
 export default class TeamSettingsModal extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_signup_display_name_page.jsx b/web/react/components/team_signup_display_name_page.jsx
index 2005ecc31..f4d5ea162 100644
--- a/web/react/components/team_signup_display_name_page.jsx
+++ b/web/react/components/team_signup_display_name_page.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
-var client = require('../utils/client.jsx');
+import * as utils from '../utils/utils.jsx';
+import * as client from '../utils/client.jsx';
 
 export default class TeamSignupDisplayNamePage extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_signup_email_item.jsx b/web/react/components/team_signup_email_item.jsx
index 1d2b24ed7..59c4771d7 100644
--- a/web/react/components/team_signup_email_item.jsx
+++ b/web/react/components/team_signup_email_item.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 export default class TeamSignupEmailItem extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_signup_password_page.jsx b/web/react/components/team_signup_password_page.jsx
index 67fd686bc..378c7fe2c 100644
--- a/web/react/components/team_signup_password_page.jsx
+++ b/web/react/components/team_signup_password_page.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../utils/client.jsx');
-var BrowserStore = require('../stores/browser_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
+import * as Client from '../utils/client.jsx';
+import BrowserStore from '../stores/browser_store.jsx';
+import UserStore from '../stores/user_store.jsx';
 
 export default class TeamSignupPasswordPage extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_signup_send_invites_page.jsx b/web/react/components/team_signup_send_invites_page.jsx
index 7b4db8fae..a580623e4 100644
--- a/web/react/components/team_signup_send_invites_page.jsx
+++ b/web/react/components/team_signup_send_invites_page.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var EmailItem = require('./team_signup_email_item.jsx');
-var Client = require('../utils/client.jsx');
+import EmailItem from './team_signup_email_item.jsx';
+import * as Client from '../utils/client.jsx';
 
 export default class TeamSignupSendInvitesPage extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_signup_url_page.jsx b/web/react/components/team_signup_url_page.jsx
index 8972fda1a..30459fc67 100644
--- a/web/react/components/team_signup_url_page.jsx
+++ b/web/react/components/team_signup_url_page.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
-const Client = require('../utils/client.jsx');
-const Constants = require('../utils/constants.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as Client from '../utils/client.jsx';
+import Constants from '../utils/constants.jsx';
 
 export default class TeamSignupUrlPage extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_signup_username_page.jsx b/web/react/components/team_signup_username_page.jsx
index d8d0dbf2c..de239f169 100644
--- a/web/react/components/team_signup_username_page.jsx
+++ b/web/react/components/team_signup_username_page.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
-var Client = require('../utils/client.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as Client from '../utils/client.jsx';
 
 export default class TeamSignupUsernamePage extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_signup_welcome_page.jsx b/web/react/components/team_signup_welcome_page.jsx
index 9448413ce..aa91a1329 100644
--- a/web/react/components/team_signup_welcome_page.jsx
+++ b/web/react/components/team_signup_welcome_page.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
-var Client = require('../utils/client.jsx');
-var BrowserStore = require('../stores/browser_store.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as Client from '../utils/client.jsx';
+import BrowserStore from '../stores/browser_store.jsx';
 
 export default class TeamSignupWelcomePage extends React.Component {
     constructor(props) {
diff --git a/web/react/components/team_signup_with_email.jsx b/web/react/components/team_signup_with_email.jsx
index 021713f04..06d6e3934 100644
--- a/web/react/components/team_signup_with_email.jsx
+++ b/web/react/components/team_signup_with_email.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('../utils/utils.jsx');
-const Client = require('../utils/client.jsx');
+import * as Utils from '../utils/utils.jsx';
+import * as Client from '../utils/client.jsx';
 
 export default class EmailSignUpPage extends React.Component {
     constructor() {
diff --git a/web/react/components/team_signup_with_sso.jsx b/web/react/components/team_signup_with_sso.jsx
index a0ccdf2c7..e3f16efb0 100644
--- a/web/react/components/team_signup_with_sso.jsx
+++ b/web/react/components/team_signup_with_sso.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var utils = require('../utils/utils.jsx');
-var client = require('../utils/client.jsx');
-var Constants = require('../utils/constants.jsx');
+import * as utils from '../utils/utils.jsx';
+import * as client from '../utils/client.jsx';
+import Constants from '../utils/constants.jsx';
 
 export default class SSOSignUpPage extends React.Component {
     constructor(props) {
diff --git a/web/react/components/textbox.jsx b/web/react/components/textbox.jsx
index 1a5269baa..e2868e946 100644
--- a/web/react/components/textbox.jsx
+++ b/web/react/components/textbox.jsx
@@ -1,14 +1,14 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-const SearchStore = require('../stores/search_store.jsx');
-const CommandList = require('./command_list.jsx');
-const ErrorStore = require('../stores/error_store.jsx');
-
-const TextFormatting = require('../utils/text_formatting.jsx');
-const Utils = require('../utils/utils.jsx');
-const Constants = require('../utils/constants.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import SearchStore from '../stores/search_store.jsx';
+import CommandList from './command_list.jsx';
+import ErrorStore from '../stores/error_store.jsx';
+
+import * as TextFormatting from '../utils/text_formatting.jsx';
+import * as Utils from '../utils/utils.jsx';
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 const KeyCodes = Constants.KeyCodes;
 
diff --git a/web/react/components/time_since.jsx b/web/react/components/time_since.jsx
index 212beb080..cffff6ee7 100644
--- a/web/react/components/time_since.jsx
+++ b/web/react/components/time_since.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
+import * as Utils from '../utils/utils.jsx';
 
 var Tooltip = ReactBootstrap.Tooltip;
 var OverlayTrigger = ReactBootstrap.OverlayTrigger;
diff --git a/web/react/components/toggle_modal_button.jsx b/web/react/components/toggle_modal_button.jsx
index 51c8d1f20..eae4a024d 100644
--- a/web/react/components/toggle_modal_button.jsx
+++ b/web/react/components/toggle_modal_button.jsx
@@ -22,7 +22,7 @@ export default class ModalToggleButton extends React.Component {
     }
 
     render() {
-        const {children, dialogType, dialogProps, ...props} = this.props;
+        const {children, dialogType, dialogProps, ...props} = this.props; //eslint-disable-line no-redeclare
 
         // this assumes that all modals will have a show property and an onHide event
         const dialog = React.createElement(this.props.dialogType, Object.assign({}, dialogProps, {
diff --git a/web/react/components/tutorial/tutorial_intro_screens.jsx b/web/react/components/tutorial/tutorial_intro_screens.jsx
index 3afc5145d..9360d31f8 100644
--- a/web/react/components/tutorial/tutorial_intro_screens.jsx
+++ b/web/react/components/tutorial/tutorial_intro_screens.jsx
@@ -1,14 +1,14 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const UserStore = require('../../stores/user_store.jsx');
-const ChannelStore = require('../../stores/channel_store.jsx');
-const TeamStore = require('../../stores/team_store.jsx');
-const PreferenceStore = require('../../stores/preference_store.jsx');
-const Utils = require('../../utils/utils.jsx');
-const AsyncClient = require('../../utils/async_client.jsx');
-
-const Constants = require('../../utils/constants.jsx');
+import UserStore from '../../stores/user_store.jsx';
+import ChannelStore from '../../stores/channel_store.jsx';
+import TeamStore from '../../stores/team_store.jsx';
+import PreferenceStore from '../../stores/preference_store.jsx';
+import * as Utils from '../../utils/utils.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
+
+import Constants from '../../utils/constants.jsx';
 const Preferences = Constants.Preferences;
 
 const NUM_SCREENS = 3;
diff --git a/web/react/components/tutorial/tutorial_tip.jsx b/web/react/components/tutorial/tutorial_tip.jsx
index dd231b816..d7c67cc9c 100644
--- a/web/react/components/tutorial/tutorial_tip.jsx
+++ b/web/react/components/tutorial/tutorial_tip.jsx
@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const UserStore = require('../../stores/user_store.jsx');
-const PreferenceStore = require('../../stores/preference_store.jsx');
-const AsyncClient = require('../../utils/async_client.jsx');
+import UserStore from '../../stores/user_store.jsx';
+import PreferenceStore from '../../stores/preference_store.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
 
-const Constants = require('../../utils/constants.jsx');
+import Constants from '../../utils/constants.jsx';
 const Preferences = Constants.Preferences;
 
 const Overlay = ReactBootstrap.Overlay;
diff --git a/web/react/components/user_profile.jsx b/web/react/components/user_profile.jsx
index a2523ef68..438c0bc82 100644
--- a/web/react/components/user_profile.jsx
+++ b/web/react/components/user_profile.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../utils/utils.jsx');
-var UserStore = require('../stores/user_store.jsx');
+import * as Utils from '../utils/utils.jsx';
+import UserStore from '../stores/user_store.jsx';
 var Popover = ReactBootstrap.Popover;
 var OverlayTrigger = ReactBootstrap.OverlayTrigger;
 
diff --git a/web/react/components/user_settings/custom_theme_chooser.jsx b/web/react/components/user_settings/custom_theme_chooser.jsx
index 3d0a2b548..35f836adb 100644
--- a/web/react/components/user_settings/custom_theme_chooser.jsx
+++ b/web/react/components/user_settings/custom_theme_chooser.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Constants = require('../../utils/constants.jsx');
+import Constants from '../../utils/constants.jsx';
 
 export default class CustomThemeChooser extends React.Component {
     constructor(props) {
diff --git a/web/react/components/user_settings/import_theme_modal.jsx b/web/react/components/user_settings/import_theme_modal.jsx
index 4d594bb1b..3df9dfedf 100644
--- a/web/react/components/user_settings/import_theme_modal.jsx
+++ b/web/react/components/user_settings/import_theme_modal.jsx
@@ -1,14 +1,14 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const ModalStore = require('../../stores/modal_store.jsx');
-const UserStore = require('../../stores/user_store.jsx');
-const Utils = require('../../utils/utils.jsx');
-const Client = require('../../utils/client.jsx');
+import ModalStore from '../../stores/modal_store.jsx';
+import UserStore from '../../stores/user_store.jsx';
+import * as Utils from '../../utils/utils.jsx';
+import * as Client from '../../utils/client.jsx';
 const Modal = ReactBootstrap.Modal;
 
-const AppDispatcher = require('../../dispatcher/app_dispatcher.jsx');
-const Constants = require('../../utils/constants.jsx');
+import AppDispatcher from '../../dispatcher/app_dispatcher.jsx';
+import Constants from '../../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 
 export default class ImportThemeModal extends React.Component {
diff --git a/web/react/components/user_settings/manage_incoming_hooks.jsx b/web/react/components/user_settings/manage_incoming_hooks.jsx
index 128c011ea..9ebb55646 100644
--- a/web/react/components/user_settings/manage_incoming_hooks.jsx
+++ b/web/react/components/user_settings/manage_incoming_hooks.jsx
@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Client = require('../../utils/client.jsx');
-var Utils = require('../../utils/utils.jsx');
-var Constants = require('../../utils/constants.jsx');
-var ChannelStore = require('../../stores/channel_store.jsx');
-var LoadingScreen = require('../loading_screen.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as Utils from '../../utils/utils.jsx';
+import Constants from '../../utils/constants.jsx';
+import ChannelStore from '../../stores/channel_store.jsx';
+import LoadingScreen from '../loading_screen.jsx';
 
 export default class ManageIncomingHooks extends React.Component {
     constructor() {
diff --git a/web/react/components/user_settings/manage_outgoing_hooks.jsx b/web/react/components/user_settings/manage_outgoing_hooks.jsx
index 7b7cf7401..9c88bb819 100644
--- a/web/react/components/user_settings/manage_outgoing_hooks.jsx
+++ b/web/react/components/user_settings/manage_outgoing_hooks.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const LoadingScreen = require('../loading_screen.jsx');
+import LoadingScreen from '../loading_screen.jsx';
 
-const ChannelStore = require('../../stores/channel_store.jsx');
+import ChannelStore from '../../stores/channel_store.jsx';
 
-const Client = require('../../utils/client.jsx');
-const Constants = require('../../utils/constants.jsx');
+import * as Client from '../../utils/client.jsx';
+import Constants from '../../utils/constants.jsx';
 
 export default class ManageOutgoingHooks extends React.Component {
     constructor() {
diff --git a/web/react/components/user_settings/premade_theme_chooser.jsx b/web/react/components/user_settings/premade_theme_chooser.jsx
index 22cfcebcd..9889bff5c 100644
--- a/web/react/components/user_settings/premade_theme_chooser.jsx
+++ b/web/react/components/user_settings/premade_theme_chooser.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Utils = require('../../utils/utils.jsx');
-var Constants = require('../../utils/constants.jsx');
+import * as Utils from '../../utils/utils.jsx';
+import Constants from '../../utils/constants.jsx';
 
 export default class PremadeThemeChooser extends React.Component {
     constructor(props) {
diff --git a/web/react/components/user_settings/user_settings.jsx b/web/react/components/user_settings/user_settings.jsx
index 40825ba93..54d98bbde 100644
--- a/web/react/components/user_settings/user_settings.jsx
+++ b/web/react/components/user_settings/user_settings.jsx
@@ -1,16 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var UserStore = require('../../stores/user_store.jsx');
-var utils = require('../../utils/utils.jsx');
-var NotificationsTab = require('./user_settings_notifications.jsx');
-var SecurityTab = require('./user_settings_security.jsx');
-var GeneralTab = require('./user_settings_general.jsx');
-var AppearanceTab = require('./user_settings_appearance.jsx');
-var DeveloperTab = require('./user_settings_developer.jsx');
-var IntegrationsTab = require('./user_settings_integrations.jsx');
-var DisplayTab = require('./user_settings_display.jsx');
-var AdvancedTab = require('./user_settings_advanced.jsx');
+import UserStore from '../../stores/user_store.jsx';
+import * as utils from '../../utils/utils.jsx';
+import NotificationsTab from './user_settings_notifications.jsx';
+import SecurityTab from './user_settings_security.jsx';
+import GeneralTab from './user_settings_general.jsx';
+import AppearanceTab from './user_settings_appearance.jsx';
+import DeveloperTab from './user_settings_developer.jsx';
+import IntegrationsTab from './user_settings_integrations.jsx';
+import DisplayTab from './user_settings_display.jsx';
+import AdvancedTab from './user_settings_advanced.jsx';
 
 export default class UserSettings extends React.Component {
     constructor(props) {
diff --git a/web/react/components/user_settings/user_settings_advanced.jsx b/web/react/components/user_settings/user_settings_advanced.jsx
index 2616981ba..ac82595f5 100644
--- a/web/react/components/user_settings/user_settings_advanced.jsx
+++ b/web/react/components/user_settings/user_settings_advanced.jsx
@@ -1,11 +1,11 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Client = require('../../utils/client.jsx');
-const SettingItemMin = require('../setting_item_min.jsx');
-const SettingItemMax = require('../setting_item_max.jsx');
-const Constants = require('../../utils/constants.jsx');
-const PreferenceStore = require('../../stores/preference_store.jsx');
+import * as Client from '../../utils/client.jsx';
+import SettingItemMin from '../setting_item_min.jsx';
+import SettingItemMax from '../setting_item_max.jsx';
+import Constants from '../../utils/constants.jsx';
+import PreferenceStore from '../../stores/preference_store.jsx';
 
 export default class AdvancedSettingsDisplay extends React.Component {
     constructor(props) {
diff --git a/web/react/components/user_settings/user_settings_appearance.jsx b/web/react/components/user_settings/user_settings_appearance.jsx
index 029a1af5e..ad41ab771 100644
--- a/web/react/components/user_settings/user_settings_appearance.jsx
+++ b/web/react/components/user_settings/user_settings_appearance.jsx
@@ -1,16 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const CustomThemeChooser = require('./custom_theme_chooser.jsx');
-const PremadeThemeChooser = require('./premade_theme_chooser.jsx');
+import CustomThemeChooser from './custom_theme_chooser.jsx';
+import PremadeThemeChooser from './premade_theme_chooser.jsx';
 
-const UserStore = require('../../stores/user_store.jsx');
+import UserStore from '../../stores/user_store.jsx';
 
-const AppDispatcher = require('../../dispatcher/app_dispatcher.jsx');
-const Client = require('../../utils/client.jsx');
-const Utils = require('../../utils/utils.jsx');
+import AppDispatcher from '../../dispatcher/app_dispatcher.jsx';
+import * as Client from '../../utils/client.jsx';
+import * as Utils from '../../utils/utils.jsx';
 
-const Constants = require('../../utils/constants.jsx');
+import Constants from '../../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 
 export default class UserSettingsAppearance extends React.Component {
diff --git a/web/react/components/user_settings/user_settings_developer.jsx b/web/react/components/user_settings/user_settings_developer.jsx
index e6adba1d4..2d02c255a 100644
--- a/web/react/components/user_settings/user_settings_developer.jsx
+++ b/web/react/components/user_settings/user_settings_developer.jsx
@@ -1,8 +1,8 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SettingItemMin = require('../setting_item_min.jsx');
-var SettingItemMax = require('../setting_item_max.jsx');
+import SettingItemMin from '../setting_item_min.jsx';
+import SettingItemMax from '../setting_item_max.jsx';
 
 export default class DeveloperTab extends React.Component {
     constructor(props) {
diff --git a/web/react/components/user_settings/user_settings_general.jsx b/web/react/components/user_settings/user_settings_general.jsx
index b363f0673..b3ec7ddd7 100644
--- a/web/react/components/user_settings/user_settings_general.jsx
+++ b/web/react/components/user_settings/user_settings_general.jsx
@@ -1,16 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const SettingItemMin = require('../setting_item_min.jsx');
-const SettingItemMax = require('../setting_item_max.jsx');
-const SettingPicture = require('../setting_picture.jsx');
+import SettingItemMin from '../setting_item_min.jsx';
+import SettingItemMax from '../setting_item_max.jsx';
+import SettingPicture from '../setting_picture.jsx';
 
-const UserStore = require('../../stores/user_store.jsx');
-const ErrorStore = require('../../stores/error_store.jsx');
+import UserStore from '../../stores/user_store.jsx';
+import ErrorStore from '../../stores/error_store.jsx';
 
-const Client = require('../../utils/client.jsx');
-const AsyncClient = require('../../utils/async_client.jsx');
-const Utils = require('../../utils/utils.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
+import * as Utils from '../../utils/utils.jsx';
 
 export default class UserSettingsGeneralTab extends React.Component {
     constructor(props) {
diff --git a/web/react/components/user_settings/user_settings_integrations.jsx b/web/react/components/user_settings/user_settings_integrations.jsx
index 744a6beea..a86510eb3 100644
--- a/web/react/components/user_settings/user_settings_integrations.jsx
+++ b/web/react/components/user_settings/user_settings_integrations.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SettingItemMin = require('../setting_item_min.jsx');
-var SettingItemMax = require('../setting_item_max.jsx');
-var ManageIncomingHooks = require('./manage_incoming_hooks.jsx');
-var ManageOutgoingHooks = require('./manage_outgoing_hooks.jsx');
+import SettingItemMin from '../setting_item_min.jsx';
+import SettingItemMax from '../setting_item_max.jsx';
+import ManageIncomingHooks from './manage_incoming_hooks.jsx';
+import ManageOutgoingHooks from './manage_outgoing_hooks.jsx';
 
 export default class UserSettingsIntegrationsTab extends React.Component {
     constructor(props) {
diff --git a/web/react/components/user_settings/user_settings_modal.jsx b/web/react/components/user_settings/user_settings_modal.jsx
index 776201295..f9d03f56d 100644
--- a/web/react/components/user_settings/user_settings_modal.jsx
+++ b/web/react/components/user_settings/user_settings_modal.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const ConfirmModal = require('../confirm_modal.jsx');
+import ConfirmModal from '../confirm_modal.jsx';
 const Modal = ReactBootstrap.Modal;
-const SettingsSidebar = require('../settings_sidebar.jsx');
-const UserSettings = require('./user_settings.jsx');
+import SettingsSidebar from '../settings_sidebar.jsx';
+import UserSettings from './user_settings.jsx';
 
 export default class UserSettingsModal extends React.Component {
     constructor(props) {
diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index c958bf5bc..e36aed395 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -1,14 +1,14 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const SettingItemMin = require('../setting_item_min.jsx');
-const SettingItemMax = require('../setting_item_max.jsx');
+import SettingItemMin from '../setting_item_min.jsx';
+import SettingItemMax from '../setting_item_max.jsx';
 
-const UserStore = require('../../stores/user_store.jsx');
+import UserStore from '../../stores/user_store.jsx';
 
-const Client = require('../../utils/client.jsx');
-const AsyncClient = require('../../utils/async_client.jsx');
-const Utils = require('../../utils/utils.jsx');
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
+import * as Utils from '../../utils/utils.jsx';
 
 function getNotificationsStateFromStores() {
     var user = UserStore.getCurrentUser();
diff --git a/web/react/components/user_settings/user_settings_security.jsx b/web/react/components/user_settings/user_settings_security.jsx
index 16ace0abc..fa2fecf07 100644
--- a/web/react/components/user_settings/user_settings_security.jsx
+++ b/web/react/components/user_settings/user_settings_security.jsx
@@ -1,14 +1,14 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SettingItemMin = require('../setting_item_min.jsx');
-var SettingItemMax = require('../setting_item_max.jsx');
-var AccessHistoryModal = require('../access_history_modal.jsx');
-var ActivityLogModal = require('../activity_log_modal.jsx');
-var ToggleModalButton = require('../toggle_modal_button.jsx');
-var Client = require('../../utils/client.jsx');
-var AsyncClient = require('../../utils/async_client.jsx');
-var Constants = require('../../utils/constants.jsx');
+import SettingItemMin from '../setting_item_min.jsx';
+import SettingItemMax from '../setting_item_max.jsx';
+import AccessHistoryModal from '../access_history_modal.jsx';
+import ActivityLogModal from '../activity_log_modal.jsx';
+import ToggleModalButton from '../toggle_modal_button.jsx';
+import * as Client from '../../utils/client.jsx';
+import * as AsyncClient from '../../utils/async_client.jsx';
+import Constants from '../../utils/constants.jsx';
 
 export default class SecurityTab extends React.Component {
     constructor(props) {
diff --git a/web/react/components/view_image.jsx b/web/react/components/view_image.jsx
index 92d7cd835..91f4b3bdc 100644
--- a/web/react/components/view_image.jsx
+++ b/web/react/components/view_image.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Client = require('../utils/client.jsx');
-const Utils = require('../utils/utils.jsx');
-const Constants = require('../utils/constants.jsx');
-const ViewImagePopoverBar = require('./view_image_popover_bar.jsx');
+import * as Client from '../utils/client.jsx';
+import * as Utils from '../utils/utils.jsx';
+import Constants from '../utils/constants.jsx';
+import ViewImagePopoverBar from './view_image_popover_bar.jsx';
 const Modal = ReactBootstrap.Modal;
 const KeyCodes = Constants.KeyCodes;
 
diff --git a/web/react/dispatcher/app_dispatcher.jsx b/web/react/dispatcher/app_dispatcher.jsx
index 388e82a51..648f0fa0d 100644
--- a/web/react/dispatcher/app_dispatcher.jsx
+++ b/web/react/dispatcher/app_dispatcher.jsx
@@ -1,17 +1,16 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Dispatcher = require('flux').Dispatcher;
-var assign = require('object-assign');
+import * as Flux from 'flux';
 
-var Constants = require('../utils/constants.jsx');
-var PayloadSources = Constants.PayloadSources;
+import Constants from '../utils/constants.jsx';
+const PayloadSources = Constants.PayloadSources;
 
-var AppDispatcher = assign(new Dispatcher(), {
+const AppDispatcher = Object.assign(new Flux.Dispatcher(), {
     handleServerAction: function performServerAction(action) {
         var payload = {
             source: PayloadSources.SERVER_ACTION,
-            action: action
+            action
         };
         this.dispatch(payload);
     },
@@ -19,7 +18,7 @@ var AppDispatcher = assign(new Dispatcher(), {
     handleViewAction: function performViewAction(action) {
         var payload = {
             source: PayloadSources.VIEW_ACTION,
-            action: action
+            action
         };
         this.dispatch(payload);
     }
diff --git a/web/react/package.json b/web/react/package.json
index de59b48ac..b63fe35fb 100644
--- a/web/react/package.json
+++ b/web/react/package.json
@@ -3,23 +3,26 @@
   "version": "0.0.1",
   "private": true,
   "dependencies": {
-    "autolinker": "0.18.1",
-    "babel-runtime": "5.8.24",
+    "autolinker": "0.22.0",
     "flux": "2.1.1",
-    "highlight.js": "^8.9.1",
+    "highlight.js": "8.9.1",
     "keymirror": "0.1.1",
     "marked": "0.3.5",
-    "object-assign": "3.0.0",
+    "object-assign": "4.0.1",
     "twemoji": "1.4.1"
   },
   "devDependencies": {
-    "browserify": "11.2.0",
-    "babelify": "6.3.0",
-    "uglify-js": "2.4.24",
-    "watchify": "3.4.0",
-    "eslint": "1.6.0",
-    "eslint-plugin-react": "3.5.1",
-    "babel-eslint": "4.1.4"
+    "browserify": "12.0.1",
+    "babelify": "7.2.0",
+    "babel-preset-es2015": "6.1.18",
+    "babel-preset-stage-0": "6.1.18",
+    "babel-preset-react": "6.1.18",
+    "babel-plugin-transform-runtime": "6.1.4",
+    "uglify-js": "2.6.1",
+    "watchify": "3.6.1",
+    "eslint": "1.9.0",
+    "eslint-plugin-react": "3.9.0",
+    "babel-eslint": "4.1.5"
   },
   "scripts": {
     "check": "",
@@ -32,8 +35,13 @@
       [
         "babelify",
         {
-          "optional": [
-            "runtime"
+          "presets": [
+            "es2015",
+            "react",
+            "stage-0"
+          ],
+          "plugins": [
+            "transform-runtime"
           ]
         }
       ]
diff --git a/web/react/pages/admin_console.jsx b/web/react/pages/admin_console.jsx
index ea9ae06f4..cbd2bd80d 100644
--- a/web/react/pages/admin_console.jsx
+++ b/web/react/pages/admin_console.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var ErrorBar = require('../components/error_bar.jsx');
-var SelectTeamModal = require('../components/admin_console/select_team_modal.jsx');
-var AdminController = require('../components/admin_console/admin_controller.jsx');
+import ErrorBar from '../components/error_bar.jsx';
+import SelectTeamModal from '../components/admin_console/select_team_modal.jsx';
+import AdminController from '../components/admin_console/admin_controller.jsx';
 
 export function setupAdminConsolePage(props) {
     ReactDOM.render(
diff --git a/web/react/pages/authorize.jsx b/web/react/pages/authorize.jsx
index 2bc8b539d..71f17d007 100644
--- a/web/react/pages/authorize.jsx
+++ b/web/react/pages/authorize.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Authorize = require('../components/authorize.jsx');
+import Authorize from '../components/authorize.jsx';
 
 function setupAuthorizePage(props) {
     ReactDOM.render(
diff --git a/web/react/pages/channel.jsx b/web/react/pages/channel.jsx
index 9aba1a564..126942e65 100644
--- a/web/react/pages/channel.jsx
+++ b/web/react/pages/channel.jsx
@@ -1,29 +1,29 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var ChannelView = require('../components/channel_view.jsx');
-var ChannelLoader = require('../components/channel_loader.jsx');
-var ErrorBar = require('../components/error_bar.jsx');
-var ErrorStore = require('../stores/error_store.jsx');
-
-var MentionList = require('../components/mention_list.jsx');
-var GetLinkModal = require('../components/get_link_modal.jsx');
-var EditChannelModal = require('../components/edit_channel_modal.jsx');
-var RenameChannelModal = require('../components/rename_channel_modal.jsx');
-var EditPostModal = require('../components/edit_post_modal.jsx');
-var DeletePostModal = require('../components/delete_post_modal.jsx');
-var MoreChannelsModal = require('../components/more_channels.jsx');
-var PostDeletedModal = require('../components/post_deleted_modal.jsx');
-var TeamSettingsModal = require('../components/team_settings_modal.jsx');
-var TeamMembersModal = require('../components/team_members.jsx');
-var RemovedFromChannelModal = require('../components/removed_from_channel_modal.jsx');
-var RegisterAppModal = require('../components/register_app_modal.jsx');
-var ImportThemeModal = require('../components/user_settings/import_theme_modal.jsx');
-var InviteMemberModal = require('../components/invite_member_modal.jsx');
-
-var AsyncClient = require('../utils/async_client.jsx');
-var Constants = require('../utils/constants.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import ChannelView from '../components/channel_view.jsx';
+import ChannelLoader from '../components/channel_loader.jsx';
+import ErrorBar from '../components/error_bar.jsx';
+import ErrorStore from '../stores/error_store.jsx';
+
+import MentionList from '../components/mention_list.jsx';
+import GetLinkModal from '../components/get_link_modal.jsx';
+import EditChannelModal from '../components/edit_channel_modal.jsx';
+import RenameChannelModal from '../components/rename_channel_modal.jsx';
+import EditPostModal from '../components/edit_post_modal.jsx';
+import DeletePostModal from '../components/delete_post_modal.jsx';
+import MoreChannelsModal from '../components/more_channels.jsx';
+import PostDeletedModal from '../components/post_deleted_modal.jsx';
+import TeamSettingsModal from '../components/team_settings_modal.jsx';
+import TeamMembersModal from '../components/team_members.jsx';
+import RemovedFromChannelModal from '../components/removed_from_channel_modal.jsx';
+import RegisterAppModal from '../components/register_app_modal.jsx';
+import ImportThemeModal from '../components/user_settings/import_theme_modal.jsx';
+import InviteMemberModal from '../components/invite_member_modal.jsx';
+
+import * as AsyncClient from '../utils/async_client.jsx';
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 function setupChannelPage(props) {
diff --git a/web/react/pages/docs.jsx b/web/react/pages/docs.jsx
index ed2b6d0c9..74d9c2d19 100644
--- a/web/react/pages/docs.jsx
+++ b/web/react/pages/docs.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Docs = require('../components/docs.jsx');
+import Docs from '../components/docs.jsx';
 
 function setupDocumentationPage(props) {
     ReactDOM.render(
diff --git a/web/react/pages/find_team.jsx b/web/react/pages/find_team.jsx
index f95fce5c6..c4653fd77 100644
--- a/web/react/pages/find_team.jsx
+++ b/web/react/pages/find_team.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var FindTeam = require('../components/find_team.jsx');
+import FindTeam from '../components/find_team.jsx';
 
 function setupFindTeamPage() {
     ReactDOM.render(
diff --git a/web/react/pages/home.jsx b/web/react/pages/home.jsx
index a59f2afd0..2c1edaa3a 100644
--- a/web/react/pages/home.jsx
+++ b/web/react/pages/home.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var ChannelStore = require('../stores/channel_store.jsx');
-var TeamStore = require('../stores/team_store.jsx');
-var Constants = require('../utils/constants.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
+import TeamStore from '../stores/team_store.jsx';
+import Constants from '../utils/constants.jsx';
 
 function setupHomePage() {
     var last = ChannelStore.getLastVisitedName();
diff --git a/web/react/pages/login.jsx b/web/react/pages/login.jsx
index 9865e6fd2..4a565623e 100644
--- a/web/react/pages/login.jsx
+++ b/web/react/pages/login.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var Login = require('../components/login.jsx');
+import Login from '../components/login.jsx';
 
 function setupLoginPage(props) {
     ReactDOM.render(
diff --git a/web/react/pages/password_reset.jsx b/web/react/pages/password_reset.jsx
index aef9ab3f9..4a6f1dcb0 100644
--- a/web/react/pages/password_reset.jsx
+++ b/web/react/pages/password_reset.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var PasswordReset = require('../components/password_reset.jsx');
+import PasswordReset from '../components/password_reset.jsx';
 
 function setupPasswordResetPage(props) {
     ReactDOM.render(
diff --git a/web/react/pages/signup_team.jsx b/web/react/pages/signup_team.jsx
index caa93b5bf..08ea45000 100644
--- a/web/react/pages/signup_team.jsx
+++ b/web/react/pages/signup_team.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SignupTeam = require('../components/signup_team.jsx');
+import SignupTeam from '../components/signup_team.jsx';
 
 function setupSignupTeamPage(props) {
     var teams = [];
diff --git a/web/react/pages/signup_team_complete.jsx b/web/react/pages/signup_team_complete.jsx
index 44ec05b98..d5ed144a1 100644
--- a/web/react/pages/signup_team_complete.jsx
+++ b/web/react/pages/signup_team_complete.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SignupTeamComplete = require('../components/signup_team_complete.jsx');
+import SignupTeamComplete from '../components/signup_team_complete.jsx';
 
 function setupSignupTeamCompletePage(props) {
     ReactDOM.render(
diff --git a/web/react/pages/signup_user_complete.jsx b/web/react/pages/signup_user_complete.jsx
index a0e0962ff..de2c48443 100644
--- a/web/react/pages/signup_user_complete.jsx
+++ b/web/react/pages/signup_user_complete.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var SignupUserComplete = require('../components/signup_user_complete.jsx');
+import SignupUserComplete from '../components/signup_user_complete.jsx';
 
 function setupSignupUserCompletePage(props) {
     ReactDOM.render(
diff --git a/web/react/pages/verify.jsx b/web/react/pages/verify.jsx
index 7535009b3..d4ce4844d 100644
--- a/web/react/pages/verify.jsx
+++ b/web/react/pages/verify.jsx
@@ -1,7 +1,7 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var EmailVerify = require('../components/email_verify.jsx');
+import EmailVerify from '../components/email_verify.jsx';
 
 global.window.setupVerifyPage = function setupVerifyPage(props) {
     ReactDOM.render(
diff --git a/web/react/stores/admin_store.jsx b/web/react/stores/admin_store.jsx
index cf16d031c..704e2ced4 100644
--- a/web/react/stores/admin_store.jsx
+++ b/web/react/stores/admin_store.jsx
@@ -1,17 +1,17 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var EventEmitter = require('events').EventEmitter;
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import EventEmitter from 'events';
 
-var BrowserStore = require('../stores/browser_store.jsx');
+import BrowserStore from '../stores/browser_store.jsx';
 
-var Constants = require('../utils/constants.jsx');
-var ActionTypes = Constants.ActionTypes;
+import Constants from '../utils/constants.jsx';
+const ActionTypes = Constants.ActionTypes;
 
-var LOG_CHANGE_EVENT = 'log_change';
-var CONFIG_CHANGE_EVENT = 'config_change';
-var ALL_TEAMS_EVENT = 'all_team_change';
+const LOG_CHANGE_EVENT = 'log_change';
+const CONFIG_CHANGE_EVENT = 'config_change';
+const ALL_TEAMS_EVENT = 'all_team_change';
 
 class AdminStoreClass extends EventEmitter {
     constructor() {
diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx
index cc0d0d14b..1d481ada4 100644
--- a/web/react/stores/channel_store.jsx
+++ b/web/react/stores/channel_store.jsx
@@ -1,19 +1,19 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var EventEmitter = require('events').EventEmitter;
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import EventEmitter from 'events';
 
 var Utils;
-var Constants = require('../utils/constants.jsx');
-var ActionTypes = Constants.ActionTypes;
+import Constants from '../utils/constants.jsx';
+const ActionTypes = Constants.ActionTypes;
 
-var BrowserStore = require('../stores/browser_store.jsx');
+import BrowserStore from '../stores/browser_store.jsx';
 
-var CHANGE_EVENT = 'change';
-var LEAVE_EVENT = 'leave';
-var MORE_CHANGE_EVENT = 'change';
-var EXTRA_INFO_EVENT = 'extra_info';
+const CHANGE_EVENT = 'change';
+const LEAVE_EVENT = 'leave';
+const MORE_CHANGE_EVENT = 'change';
+const EXTRA_INFO_EVENT = 'extra_info';
 
 class ChannelStoreClass extends EventEmitter {
     constructor(props) {
diff --git a/web/react/stores/error_store.jsx b/web/react/stores/error_store.jsx
index 775b8e006..8fb051138 100644
--- a/web/react/stores/error_store.jsx
+++ b/web/react/stores/error_store.jsx
@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var EventEmitter = require('events').EventEmitter;
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import EventEmitter from 'events';
 
-var Constants = require('../utils/constants.jsx');
-var ActionTypes = Constants.ActionTypes;
+import Constants from '../utils/constants.jsx';
+const ActionTypes = Constants.ActionTypes;
 
-var BrowserStore = require('../stores/browser_store.jsx');
+import BrowserStore from '../stores/browser_store.jsx';
 
-var CHANGE_EVENT = 'change';
+const CHANGE_EVENT = 'change';
 
 class ErrorStoreClass extends EventEmitter {
     constructor() {
diff --git a/web/react/stores/modal_store.jsx b/web/react/stores/modal_store.jsx
index 809f83a59..69f43a5cf 100644
--- a/web/react/stores/modal_store.jsx
+++ b/web/react/stores/modal_store.jsx
@@ -1,10 +1,10 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-const EventEmitter = require('events').EventEmitter;
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import EventEmitter from 'events';
 
-const Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 
 class ModalStoreClass extends EventEmitter {
@@ -28,7 +28,7 @@ class ModalStoreClass extends EventEmitter {
 
     handleEventPayload(payload) {
         // toggle event handlers should accept a boolean show/hide value and can accept a map of arguments
-        const {type, value, ...args} = payload.action;
+        const {type, value, ...args} = payload.action; //eslint-disable-line no-redeclare
 
         switch (type) {
         case ActionTypes.TOGGLE_IMPORT_THEME_MODAL:
diff --git a/web/react/stores/post_store.jsx b/web/react/stores/post_store.jsx
index a564a2435..ec01eef18 100644
--- a/web/react/stores/post_store.jsx
+++ b/web/react/stores/post_store.jsx
@@ -1,20 +1,20 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var EventEmitter = require('events').EventEmitter;
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import EventEmitter from 'events';
 
-var ChannelStore = require('../stores/channel_store.jsx');
-var BrowserStore = require('../stores/browser_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
+import ChannelStore from '../stores/channel_store.jsx';
+import BrowserStore from '../stores/browser_store.jsx';
+import UserStore from '../stores/user_store.jsx';
 
-var Constants = require('../utils/constants.jsx');
-var ActionTypes = Constants.ActionTypes;
+import Constants from '../utils/constants.jsx';
+const ActionTypes = Constants.ActionTypes;
 
-var CHANGE_EVENT = 'change';
-var SELECTED_POST_CHANGE_EVENT = 'selected_post_change';
-var EDIT_POST_EVENT = 'edit_post';
-var POSTS_VIEW_JUMP_EVENT = 'post_list_jump';
+const CHANGE_EVENT = 'change';
+const SELECTED_POST_CHANGE_EVENT = 'selected_post_change';
+const EDIT_POST_EVENT = 'edit_post';
+const POSTS_VIEW_JUMP_EVENT = 'post_list_jump';
 
 class PostStoreClass extends EventEmitter {
     constructor() {
diff --git a/web/react/stores/preference_store.jsx b/web/react/stores/preference_store.jsx
index f630d150d..068bc29c2 100644
--- a/web/react/stores/preference_store.jsx
+++ b/web/react/stores/preference_store.jsx
@@ -1,11 +1,12 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const ActionTypes = require('../utils/constants.jsx').ActionTypes;
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-const BrowserStore = require('./browser_store.jsx');
-const EventEmitter = require('events').EventEmitter;
-const UserStore = require('../stores/user_store.jsx');
+import Constants from '../utils/constants.jsx';
+const ActionTypes = Constants.ActionTypes;
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import BrowserStore from './browser_store.jsx';
+import EventEmitter from 'events';
+import UserStore from '../stores/user_store.jsx';
 
 const CHANGE_EVENT = 'change';
 
@@ -105,7 +106,7 @@ class PreferenceStoreClass extends EventEmitter {
         const action = payload.action;
 
         switch (action.type) {
-        case ActionTypes.RECIEVED_PREFERENCES:
+        case ActionTypes.RECIEVED_PREFERENCES: {
             const preferences = this.getAllPreferences();
 
             for (const preference of action.preferences) {
@@ -114,6 +115,8 @@ class PreferenceStoreClass extends EventEmitter {
 
             this.setAllPreferences(preferences);
             this.emitChange(preferences);
+            break;
+        }
         }
     }
 }
diff --git a/web/react/stores/search_store.jsx b/web/react/stores/search_store.jsx
index 93b89035c..e8ab6a2ae 100644
--- a/web/react/stores/search_store.jsx
+++ b/web/react/stores/search_store.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var EventEmitter = require('events').EventEmitter;
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import EventEmitter from 'events';
 
-var BrowserStore = require('../stores/browser_store.jsx');
+import BrowserStore from '../stores/browser_store.jsx';
 
-var Constants = require('../utils/constants.jsx');
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 var CHANGE_EVENT = 'change';
diff --git a/web/react/stores/socket_store.jsx b/web/react/stores/socket_store.jsx
index 4efeb7c8f..f2936c50a 100644
--- a/web/react/stores/socket_store.jsx
+++ b/web/react/stores/socket_store.jsx
@@ -1,18 +1,18 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-const UserStore = require('./user_store.jsx');
-const PostStore = require('./post_store.jsx');
-const ChannelStore = require('./channel_store.jsx');
-const BrowserStore = require('./browser_store.jsx');
-const ErrorStore = require('./error_store.jsx');
-const EventEmitter = require('events').EventEmitter;
-
-const Utils = require('../utils/utils.jsx');
-const AsyncClient = require('../utils/async_client.jsx');
-
-const Constants = require('../utils/constants.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import UserStore from './user_store.jsx';
+import PostStore from './post_store.jsx';
+import ChannelStore from './channel_store.jsx';
+import BrowserStore from './browser_store.jsx';
+import ErrorStore from './error_store.jsx';
+import EventEmitter from 'events';
+
+import * as Utils from '../utils/utils.jsx';
+import * as AsyncClient from '../utils/async_client.jsx';
+
+import Constants from '../utils/constants.jsx';
 const ActionTypes = Constants.ActionTypes;
 const SocketEvents = Constants.SocketEvents;
 
diff --git a/web/react/stores/team_store.jsx b/web/react/stores/team_store.jsx
index 22114ae85..26c83cc8c 100644
--- a/web/react/stores/team_store.jsx
+++ b/web/react/stores/team_store.jsx
@@ -1,14 +1,14 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var EventEmitter = require('events').EventEmitter;
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import EventEmitter from 'events';
 
-var Constants = require('../utils/constants.jsx');
-var ActionTypes = Constants.ActionTypes;
-var BrowserStore = require('../stores/browser_store.jsx');
+import Constants from '../utils/constants.jsx';
+const ActionTypes = Constants.ActionTypes;
+import BrowserStore from '../stores/browser_store.jsx';
 
-var CHANGE_EVENT = 'change';
+const CHANGE_EVENT = 'change';
 
 var Utils;
 function getWindowLocationOrigin() {
diff --git a/web/react/stores/user_store.jsx b/web/react/stores/user_store.jsx
index 40b64b34b..3e1871180 100644
--- a/web/react/stores/user_store.jsx
+++ b/web/react/stores/user_store.jsx
@@ -1,18 +1,18 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var EventEmitter = require('events').EventEmitter;
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import EventEmitter from 'events';
 
-var Constants = require('../utils/constants.jsx');
-var ActionTypes = Constants.ActionTypes;
-var BrowserStore = require('./browser_store.jsx');
+import Constants from '../utils/constants.jsx';
+const ActionTypes = Constants.ActionTypes;
+import BrowserStore from './browser_store.jsx';
 
-var CHANGE_EVENT = 'change';
-var CHANGE_EVENT_SESSIONS = 'change_sessions';
-var CHANGE_EVENT_AUDITS = 'change_audits';
-var CHANGE_EVENT_TEAMS = 'change_teams';
-var CHANGE_EVENT_STATUSES = 'change_statuses';
+const CHANGE_EVENT = 'change';
+const CHANGE_EVENT_SESSIONS = 'change_sessions';
+const CHANGE_EVENT_AUDITS = 'change_audits';
+const CHANGE_EVENT_TEAMS = 'change_teams';
+const CHANGE_EVENT_STATUSES = 'change_statuses';
 
 class UserStoreClass extends EventEmitter {
     constructor() {
@@ -354,5 +354,4 @@ UserStore.dispatchToken = AppDispatcher.register((payload) => {
     }
 });
 
-global.window.UserStore = UserStore;
-export default UserStore;
+export {UserStore as default};
diff --git a/web/react/utils/async_client.jsx b/web/react/utils/async_client.jsx
index b39648bf0..fac4cd009 100644
--- a/web/react/utils/async_client.jsx
+++ b/web/react/utils/async_client.jsx
@@ -1,15 +1,15 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var client = require('./client.jsx');
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var BrowserStore = require('../stores/browser_store.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var PostStore = require('../stores/post_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var utils = require('./utils.jsx');
-
-var Constants = require('./constants.jsx');
+import * as client from './client.jsx';
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import BrowserStore from '../stores/browser_store.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import PostStore from '../stores/post_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import * as utils from './utils.jsx';
+
+import Constants from './constants.jsx';
 var ActionTypes = Constants.ActionTypes;
 
 // Used to track in progress async calls
diff --git a/web/react/utils/channel_intro_mssages.jsx b/web/react/utils/channel_intro_mssages.jsx
index 28a458e3f..aef1593dc 100644
--- a/web/react/utils/channel_intro_mssages.jsx
+++ b/web/react/utils/channel_intro_mssages.jsx
@@ -2,12 +2,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Utils = require('./utils.jsx');
-const InviteMemberModal = require('../components/invite_member_modal.jsx');
-const UserProfile = require('../components/user_profile.jsx');
-const ChannelStore = require('../stores/channel_store.jsx');
-const Constants = require('../utils/constants.jsx');
-const TeamStore = require('../stores/team_store.jsx');
+import * as Utils from './utils.jsx';
+import InviteMemberModal from '../components/invite_member_modal.jsx';
+import UserProfile from '../components/user_profile.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import Constants from '../utils/constants.jsx';
+import TeamStore from '../stores/team_store.jsx';
 
 export function createChannelIntroMessage(channel, showInviteModal) {
     if (channel.type === 'D') {
@@ -71,7 +71,7 @@ export function createDMIntroMessage(channel) {
     );
 }
 
-export function createOffTopicIntroMessage(channel, showInviteModal) {
+export function createOffTopicIntroMessage(channel, showInviteModal) { //eslint-disable-line react/no-multi-comp
     return (
         <div className='channel-intro'>
             <h4 className='channel-intro__title'>{'Beginning of ' + channel.display_name}</h4>
@@ -101,7 +101,7 @@ export function createOffTopicIntroMessage(channel, showInviteModal) {
     );
 }
 
-export function createDefaultIntroMessage(channel) {
+export function createDefaultIntroMessage(channel) { //eslint-disable-line react/no-multi-comp
     const team = TeamStore.getCurrent();
     let inviteModalLink;
     if (team.type === Constants.INVITE_TEAM) {
@@ -154,7 +154,7 @@ export function createDefaultIntroMessage(channel) {
     );
 }
 
-export function createStandardIntroMessage(channel, showInviteModal) {
+export function createStandardIntroMessage(channel, showInviteModal) { //eslint-disable-line react/no-multi-comp
     var uiName = channel.display_name;
     var creatorName = '';
 
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index d27fe16cf..e6c24aa9c 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -1,8 +1,8 @@
 // See License.txt for license information.
 
-var BrowserStore = require('../stores/browser_store.jsx');
-var TeamStore = require('../stores/team_store.jsx');
-var ErrorStore = require('../stores/error_store.jsx');
+import BrowserStore from '../stores/browser_store.jsx';
+import TeamStore from '../stores/team_store.jsx';
+import ErrorStore from '../stores/error_store.jsx';
 
 export function track(category, action, label, property, value) {
     global.window.analytics.track(action, {category, label, property, value});
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 80c0cf0ee..958bfa8d2 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -1,9 +1,9 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var keyMirror = require('keymirror');
+import keyMirror from 'keymirror';
 
-module.exports = {
+export default {
     ActionTypes: keyMirror({
         RECIEVED_ERROR: null,
 
diff --git a/web/react/utils/highlight.jsx b/web/react/utils/highlight.jsx
deleted file mode 100644
index 68fef7930..000000000
--- a/web/react/utils/highlight.jsx
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
-// See License.txt for license information.
-
-const highlightJs = require('highlight.js/lib/highlight.js');
-const highlightJsDiff = require('highlight.js/lib/languages/diff.js');
-const highlightJsApache = require('highlight.js/lib/languages/apache.js');
-const highlightJsMakefile = require('highlight.js/lib/languages/makefile.js');
-const highlightJsHttp = require('highlight.js/lib/languages/http.js');
-const highlightJsJson = require('highlight.js/lib/languages/json.js');
-const highlightJsMarkdown = require('highlight.js/lib/languages/markdown.js');
-const highlightJsJavascript = require('highlight.js/lib/languages/javascript.js');
-const highlightJsCss = require('highlight.js/lib/languages/css.js');
-const highlightJsNginx = require('highlight.js/lib/languages/nginx.js');
-const highlightJsObjectivec = require('highlight.js/lib/languages/objectivec.js');
-const highlightJsPython = require('highlight.js/lib/languages/python.js');
-const highlightJsXml = require('highlight.js/lib/languages/xml.js');
-const highlightJsPerl = require('highlight.js/lib/languages/perl.js');
-const highlightJsBash = require('highlight.js/lib/languages/bash.js');
-const highlightJsPhp = require('highlight.js/lib/languages/php.js');
-const highlightJsCoffeescript = require('highlight.js/lib/languages/coffeescript.js');
-const highlightJsCs = require('highlight.js/lib/languages/cs.js');
-const highlightJsCpp = require('highlight.js/lib/languages/cpp.js');
-const highlightJsSql = require('highlight.js/lib/languages/sql.js');
-const highlightJsGo = require('highlight.js/lib/languages/go.js');
-const highlightJsRuby = require('highlight.js/lib/languages/ruby.js');
-const highlightJsJava = require('highlight.js/lib/languages/java.js');
-const highlightJsIni = require('highlight.js/lib/languages/ini.js');
-
-highlightJs.registerLanguage('diff', highlightJsDiff);
-highlightJs.registerLanguage('apache', highlightJsApache);
-highlightJs.registerLanguage('makefile', highlightJsMakefile);
-highlightJs.registerLanguage('http', highlightJsHttp);
-highlightJs.registerLanguage('json', highlightJsJson);
-highlightJs.registerLanguage('markdown', highlightJsMarkdown);
-highlightJs.registerLanguage('javascript', highlightJsJavascript);
-highlightJs.registerLanguage('css', highlightJsCss);
-highlightJs.registerLanguage('nginx', highlightJsNginx);
-highlightJs.registerLanguage('objectivec', highlightJsObjectivec);
-highlightJs.registerLanguage('python', highlightJsPython);
-highlightJs.registerLanguage('xml', highlightJsXml);
-highlightJs.registerLanguage('perl', highlightJsPerl);
-highlightJs.registerLanguage('bash', highlightJsBash);
-highlightJs.registerLanguage('php', highlightJsPhp);
-highlightJs.registerLanguage('coffeescript', highlightJsCoffeescript);
-highlightJs.registerLanguage('cs', highlightJsCs);
-highlightJs.registerLanguage('cpp', highlightJsCpp);
-highlightJs.registerLanguage('sql', highlightJsSql);
-highlightJs.registerLanguage('go', highlightJsGo);
-highlightJs.registerLanguage('ruby', highlightJsRuby);
-highlightJs.registerLanguage('java', highlightJsJava);
-highlightJs.registerLanguage('ini', highlightJsIni);
diff --git a/web/react/utils/markdown.jsx b/web/react/utils/markdown.jsx
index 4d1a35d19..7957ea31b 100644
--- a/web/react/utils/markdown.jsx
+++ b/web/react/utils/markdown.jsx
@@ -1,14 +1,62 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-require('./highlight.jsx');
-const TextFormatting = require('./text_formatting.jsx');
-const Utils = require('./utils.jsx');
-
-const highlightJs = require('highlight.js/lib/highlight.js');
-const marked = require('marked');
-
-const HighlightedLanguages = require('../utils/constants.jsx').HighlightedLanguages;
+import highlightJs from 'highlight.js/lib/highlight.js';
+import highlightJsDiff from 'highlight.js/lib/languages/diff.js';
+import highlightJsApache from 'highlight.js/lib/languages/apache.js';
+import highlightJsMakefile from 'highlight.js/lib/languages/makefile.js';
+import highlightJsHttp from 'highlight.js/lib/languages/http.js';
+import highlightJsJson from 'highlight.js/lib/languages/json.js';
+import highlightJsMarkdown from 'highlight.js/lib/languages/markdown.js';
+import highlightJsJavascript from 'highlight.js/lib/languages/javascript.js';
+import highlightJsCss from 'highlight.js/lib/languages/css.js';
+import highlightJsNginx from 'highlight.js/lib/languages/nginx.js';
+import highlightJsObjectivec from 'highlight.js/lib/languages/objectivec.js';
+import highlightJsPython from 'highlight.js/lib/languages/python.js';
+import highlightJsXml from 'highlight.js/lib/languages/xml.js';
+import highlightJsPerl from 'highlight.js/lib/languages/perl.js';
+import highlightJsBash from 'highlight.js/lib/languages/bash.js';
+import highlightJsPhp from 'highlight.js/lib/languages/php.js';
+import highlightJsCoffeescript from 'highlight.js/lib/languages/coffeescript.js';
+import highlightJsCs from 'highlight.js/lib/languages/cs.js';
+import highlightJsCpp from 'highlight.js/lib/languages/cpp.js';
+import highlightJsSql from 'highlight.js/lib/languages/sql.js';
+import highlightJsGo from 'highlight.js/lib/languages/go.js';
+import highlightJsRuby from 'highlight.js/lib/languages/ruby.js';
+import highlightJsJava from 'highlight.js/lib/languages/java.js';
+import highlightJsIni from 'highlight.js/lib/languages/ini.js';
+
+highlightJs.registerLanguage('diff', highlightJsDiff);
+highlightJs.registerLanguage('apache', highlightJsApache);
+highlightJs.registerLanguage('makefile', highlightJsMakefile);
+highlightJs.registerLanguage('http', highlightJsHttp);
+highlightJs.registerLanguage('json', highlightJsJson);
+highlightJs.registerLanguage('markdown', highlightJsMarkdown);
+highlightJs.registerLanguage('javascript', highlightJsJavascript);
+highlightJs.registerLanguage('css', highlightJsCss);
+highlightJs.registerLanguage('nginx', highlightJsNginx);
+highlightJs.registerLanguage('objectivec', highlightJsObjectivec);
+highlightJs.registerLanguage('python', highlightJsPython);
+highlightJs.registerLanguage('xml', highlightJsXml);
+highlightJs.registerLanguage('perl', highlightJsPerl);
+highlightJs.registerLanguage('bash', highlightJsBash);
+highlightJs.registerLanguage('php', highlightJsPhp);
+highlightJs.registerLanguage('coffeescript', highlightJsCoffeescript);
+highlightJs.registerLanguage('cs', highlightJsCs);
+highlightJs.registerLanguage('cpp', highlightJsCpp);
+highlightJs.registerLanguage('sql', highlightJsSql);
+highlightJs.registerLanguage('go', highlightJsGo);
+highlightJs.registerLanguage('ruby', highlightJsRuby);
+highlightJs.registerLanguage('java', highlightJsJava);
+highlightJs.registerLanguage('ini', highlightJsIni);
+
+import * as TextFormatting from './text_formatting.jsx';
+import * as Utils from './utils.jsx';
+
+import marked from 'marked';
+
+import Constants from '../utils/constants.jsx';
+const HighlightedLanguages = Constants.HighlightedLanguages;
 
 function markdownImageLoaded(image) {
     image.style.height = 'auto';
diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx
index 7f1d7175d..3a912fd75 100644
--- a/web/react/utils/text_formatting.jsx
+++ b/web/react/utils/text_formatting.jsx
@@ -1,12 +1,12 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-const Autolinker = require('autolinker');
-const Constants = require('./constants.jsx');
-const Emoticons = require('./emoticons.jsx');
-const Markdown = require('./markdown.jsx');
-const UserStore = require('../stores/user_store.jsx');
-const Utils = require('./utils.jsx');
+import Autolinker from 'autolinker';
+import Constants from './constants.jsx';
+import * as Emoticons from './emoticons.jsx';
+import * as Markdown from './markdown.jsx';
+import UserStore from '../stores/user_store.jsx';
+import * as Utils from './utils.jsx';
 
 // Performs formatting of user posts including highlighting mentions and search terms and converting urls, hashtags, and
 // @mentions to links by taking a user's message and returning a string of formatted html. Also takes a number of options
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index cd347f7d6..668d8100f 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -1,17 +1,17 @@
 // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
 // See License.txt for license information.
 
-var AppDispatcher = require('../dispatcher/app_dispatcher.jsx');
-var ChannelStore = require('../stores/channel_store.jsx');
-var UserStore = require('../stores/user_store.jsx');
-var PreferenceStore = require('../stores/preference_store.jsx');
-var TeamStore = require('../stores/team_store.jsx');
-var Constants = require('../utils/constants.jsx');
+import AppDispatcher from '../dispatcher/app_dispatcher.jsx';
+import ChannelStore from '../stores/channel_store.jsx';
+import UserStore from '../stores/user_store.jsx';
+import PreferenceStore from '../stores/preference_store.jsx';
+import TeamStore from '../stores/team_store.jsx';
+import Constants from '../utils/constants.jsx';
 var ActionTypes = Constants.ActionTypes;
-var Client = require('./client.jsx');
-var AsyncClient = require('./async_client.jsx');
-var client = require('./client.jsx');
-var Autolinker = require('autolinker');
+import * as Client from './client.jsx';
+import * as AsyncClient from './async_client.jsx';
+import * as client from './client.jsx';
+import Autolinker from 'autolinker';
 
 export function isEmail(email) {
     //var regex = /^([a-zA-Z0-9_.+-])+\@(([a-zA-Z0-9-])+\.)+([a-zA-Z0-9]{2,4})+$/;