3 files changed, 25 insertions, 24 deletions
diff --git a/web/react/utils/client.jsx b/web/react/utils/client.jsx
index 5d02a8c88..beabf5227 100644
--- a/web/react/utils/client.jsx
+++ b/web/react/utils/client.jsx
@@ -246,6 +246,7 @@ export function loginByEmail(name, email, password, success, error) {
         data: JSON.stringify({name: name, email: email, password: password}),
         success: function onSuccess(data, textStatus, xhr) {
             track('api', 'api_users_login_success', data.team_id, 'email', data.email);
+            BrowserStore.signalLogin();
             success(data, textStatus, xhr);
         },
         error: function onError(xhr, status, err) {
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index d23c18b5d..5f027a409 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -166,29 +166,6 @@ export default {
     UPDATE_TYPING_MS: 5000,
     THEMES: {
         default: {
-            type: 'Mattermost',
-            sidebarBg: '#fafafa',
-            sidebarText: '#333333',
-            sidebarUnreadText: '#333333',
-            sidebarTextHoverBg: '#e6f2fa',
-            sidebarTextActiveBorder: '#378FD2',
-            sidebarTextActiveColor: '#111111',
-            sidebarHeaderBg: '#2389d7',
-            sidebarHeaderTextColor: '#ffffff',
-            onlineIndicator: '#7DBE00',
-            mentionBj: '#2389d7',
-            mentionColor: '#ffffff',
-            centerChannelBg: '#ffffff',
-            centerChannelColor: '#333333',
-            newMessageSeparator: '#FF8800',
-            linkColor: '#2389d7',
-            buttonBg: '#2389d7',
-            buttonColor: '#FFFFFF',
-            mentionHighlightBg: '#fff2bb',
-            mentionHighlightLink: '#2f81b7',
-            codeTheme: 'github'
-        },
-        organization: {
             type: 'Organization',
             sidebarBg: '#2071a7',
             sidebarText: '#fff',
@@ -211,6 +188,29 @@ export default {
             mentionHighlightLink: '#2f81b7',
             codeTheme: 'github'
         },
+        mattermost: {
+            type: 'Mattermost',
+            sidebarBg: '#fafafa',
+            sidebarText: '#333333',
+            sidebarUnreadText: '#333333',
+            sidebarTextHoverBg: '#e6f2fa',
+            sidebarTextActiveBorder: '#378FD2',
+            sidebarTextActiveColor: '#111111',
+            sidebarHeaderBg: '#2389d7',
+            sidebarHeaderTextColor: '#ffffff',
+            onlineIndicator: '#7DBE00',
+            mentionBj: '#2389d7',
+            mentionColor: '#ffffff',
+            centerChannelBg: '#ffffff',
+            centerChannelColor: '#333333',
+            newMessageSeparator: '#FF8800',
+            linkColor: '#2389d7',
+            buttonBg: '#2389d7',
+            buttonColor: '#FFFFFF',
+            mentionHighlightBg: '#fff2bb',
+            mentionHighlightLink: '#2f81b7',
+            codeTheme: 'github'
+        },
         mattermostDark: {
             type: 'Mattermost Dark',
             sidebarBg: '#1B2C3E',
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index fb8b89252..a98d22eaf 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -544,7 +544,7 @@ export function applyTheme(theme) {
         changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li>a', 'color:' + theme.sidebarText, 1);
         changeCss('.sidebar--left .nav-pills__container li>h4, .sidebar--left .add-channel-btn', 'color:' + changeOpacity(theme.sidebarText, 0.6), 1);
         changeCss('.sidebar--left .add-channel-btn:hover, .sidebar--left .add-channel-btn:focus', 'color:' + theme.sidebarText, 1);
-        changeCss('.sidebar--left .status path', 'fill:' + changeOpacity(theme.sidebarText, 0.5), 1);
+        changeCss('.sidebar--left .status path', 'fill:' + theme.sidebarText, 1);
         changeCss('@media(max-width: 768px){.settings-modal .settings-table .nav>li>a', 'border-color:' + changeOpacity(theme.sidebarText, 0.2), 2);
     }