11 files changed, 142 insertions, 35 deletions

diff --git a/packages/theme/src/themes/legacy/index.ts b/packages/theme/src/themes/legacy/index.ts
index 5a2d56a84..17dcf883e 100644
--- a/packages/theme/src/themes/legacy/index.ts
+++ b/packages/theme/src/themes/legacy/index.ts
@@ -5,9 +5,9 @@ export const themeBrandInfo = '#5bc0de';
 export const themeBrandWarning = '#FF9F00';
 export const themeBrandDanger = '#d9534f';
 
-export const themeGrayDark = '#7367F0';
-export const themeGray = '#7367F0';
-export const themeGrayLight = '#CE9FFC';
+export const themeGrayDark = '#373a3c';
+export const themeGray = '#55595c';
+export const themeGrayLight = '#818a91';
 export const themeGrayLighter = '#eceeef';
 export const themeGrayLightest = '#f7f7f9';
 
diff --git a/src/components/auth/Login.js b/src/components/auth/Login.js
index f8caebd7e..1563e471a 100644
--- a/src/components/auth/Login.js
+++ b/src/components/auth/Login.js
@@ -34,6 +34,14 @@ const messages = defineMessages({
     id: 'login.invalidCredentials',
     defaultMessage: '!!!Email or password not valid',
   },
+  customServerQuestion: {
+    id: 'login.customServerQuestion',
+    defaultMessage: '!!!Using a custom Ferdi server?',
+  },
+  customServerSuggestion: {
+    id: 'login.customServerSuggestion',
+    defaultMessage: '!!!Try importing your Franz account',
+  },
   tokenExpired: {
     id: 'login.tokenExpired',
     defaultMessage: '!!!Your session expired, please login again.',
@@ -141,14 +149,13 @@ export default @observer class Login extends Component {
               <p className="error-message center">{intl.formatMessage(messages.invalidCredentials)}</p>
               { window.ferdi.stores.settings.all.app.server !== 'https://api.franzinfra.com' && (
                 <p className="error-message center">
-                    Using a custom Ferdi server? Try
-                  {' '}
+                    {intl.formatMessage(messages.customServerQuestion)}{' '}
                   <Link
                     to={`${window.ferdi.stores.settings.all.app.server.replace('v1', '')}/import`}
                     target="_blank"
                     style={{ cursor: 'pointer', textDecoration: 'underline' }}
                   >
-importing your Franz account
+                    {intl.formatMessage(messages.customServerSuggestion)}
                   </Link>
                 </p>
               )}
diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index 02550c87f..5c3d301e0 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -34,6 +34,10 @@ const messages = defineMessages({
     id: 'infobar.requiredRequestsFailed',
     defaultMessage: '!!!Could not load services and user information',
   },
+  authRequestFailed: {
+    id: 'infobar.authRequestFailed',
+    defaultMessage: '!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.',
+  },
 });
 
 const styles = theme => ({
@@ -154,7 +158,7 @@ class AppLayout extends Component {
                   onClick={retryRequiredRequests}
                 >
                   <span className="mdi mdi-flash" />
-                  There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.
+                  {intl.formatMessage(messages.authRequestFailed)}
                 </InfoBar>
               )}
               {showServicesUpdatedInfoBar && (
diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index 9fe737529..5fad070f0 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -16,6 +16,14 @@ const messages = defineMessages({
     id: 'services.getStarted',
     defaultMessage: '!!!Get started',
   },
+  login: {
+    id: 'services.login',
+    defaultMessage: '!!!Please login to use Ferdi.',
+  },
+  serverInfo: {
+    id: 'services.serverInfo',
+    defaultMessage: '!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.',
+  },
 });
 
 export default @observer class Services extends Component {
@@ -64,8 +72,8 @@ export default @observer class Services extends Component {
               <h1>{intl.formatMessage(messages.welcome)}</h1>
               { !isLoggedIn && (
                 <>
-                  <p>Please login to use Ferdi.</p>
-                  <p>Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.</p>
+                  <p>{intl.formatMessage(messages.login)}</p>
+                  <p>{intl.formatMessage(messages.serverInfo)}</p>
                 </>
               ) }
               <Appear
diff --git a/src/containers/settings/EditSettingsScreen.js b/src/containers/settings/EditSettingsScreen.js
index 246952125..38f73c20f 100644
--- a/src/containers/settings/EditSettingsScreen.js
+++ b/src/containers/settings/EditSettingsScreen.js
@@ -41,6 +41,10 @@ const messages = defineMessages({
     id: 'settings.app.form.minimizeToSystemTray',
     defaultMessage: '!!!Minimize Ferdi to system tray',
   },
+  server: {
+    id: 'settings.app.form.server',
+    defaultMessage: '!!!Server',
+  },
   language: {
     id: 'settings.app.form.language',
     defaultMessage: '!!!Language',
@@ -151,7 +155,7 @@ export default @inject('stores', 'actions') @observer class EditSettingsScreen e
           default: DEFAULT_APP_SETTINGS.minimizeToSystemTray,
         },
         server: {
-          label: 'Server',
+          label: intl.formatMessage(messages.server),
           value: settings.all.app.server || API,
           default: API,
         },
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index d920c3c5f..440002823 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -26,6 +26,7 @@
   "infobar.buttonInstallUpdate": "Restart & install update",
   "infobar.buttonReloadServices": "Reload services",
   "infobar.requiredRequestsFailed": "Could not load services and user information",
+  "infobar.authRequestFailed": "There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
   "infobar.servicesUpdated": "Your services have been updated.",
   "infobar.updateAvailable": "A new update for Ferdi is available.",
   "invite.email.label": "Email address",
@@ -37,6 +38,8 @@
   "login.email.label": "Email address",
   "login.headline": "Sign in",
   "login.invalidCredentials": "Email or password not valid",
+  "login.customServerQuestion": "Using a custom Ferdi server?",
+  "login.customServerSuggestion": "Try importing your Franz account",
   "login.link.password": "Reset password",
   "login.link.signup": "Create a free account",
   "login.password.label": "Password",
@@ -124,6 +127,8 @@
   "service.webviewLoader.loading": "Loading",
   "services.getStarted": "Get started",
   "services.welcome": "Welcome to Ferdi",
+  "services.login": "Please login to use Ferdi.",
+  "services.serverInfo": "Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
   "settings.account.account.editButton": "Edit account",
   "settings.account.accountType.basic": "Basic Account",
   "settings.account.accountType.premium": "Premium Supporter Account",
@@ -159,6 +164,7 @@
   "settings.app.form.enableSystemTray": "Show Ferdi in system tray",
   "settings.app.form.language": "Language",
   "settings.app.form.minimizeToSystemTray": "Minimize Ferdi to system tray",
+  "settings.app.form.server": "Server",
   "settings.app.form.runInBackground": "Keep Ferdi in background when closing the window",
   "settings.app.form.showDisabledServices": "Display disabled services tabs",
   "settings.app.form.showMessagesBadgesWhenMuted": "Show unread message badge when notifications are disabled",
diff --git a/src/i18n/messages/src/components/auth/Login.json b/src/i18n/messages/src/components/auth/Login.json
index 177f6000b..d593eac68 100644
--- a/src/i18n/messages/src/components/auth/Login.json
+++ b/src/i18n/messages/src/components/auth/Login.json
@@ -65,15 +65,41 @@
     }
   },
   {
+    "id": "login.customServerQuestion",
+    "defaultMessage": "!!!Using a custom Ferdi server?",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 37,
+      "column": 24
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
+  },
+  {
+    "id": "login.customServerSuggestion",
+    "defaultMessage": "!!!Try importing your Franz account",
+    "file": "src/components/auth/Login.js",
+    "start": {
+      "line": 41,
+      "column": 26
+    },
+    "end": {
+      "line": 44,
+      "column": 3
+    }
+  },
+  {
     "id": "login.tokenExpired",
     "defaultMessage": "!!!Your session expired, please login again.",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 37,
+      "line": 45,
       "column": 16
     },
     "end": {
-      "line": 40,
+      "line": 48,
       "column": 3
     }
   },
@@ -82,11 +108,11 @@
     "defaultMessage": "!!!Your session expired, please login again.",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 41,
+      "line": 49,
       "column": 16
     },
     "end": {
-      "line": 44,
+      "line": 52,
       "column": 3
     }
   },
@@ -95,11 +121,11 @@
     "defaultMessage": "!!!Create a free account",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 45,
+      "line": 53,
       "column": 14
     },
     "end": {
-      "line": 48,
+      "line": 56,
       "column": 3
     }
   },
@@ -108,11 +134,11 @@
     "defaultMessage": "!!!Forgot password",
     "file": "src/components/auth/Login.js",
     "start": {
-      "line": 49,
+      "line": 57,
       "column": 16
     },
     "end": {
-      "line": 52,
+      "line": 60,
       "column": 3
     }
   }
diff --git a/src/i18n/messages/src/components/layout/AppLayout.json b/src/i18n/messages/src/components/layout/AppLayout.json
index ff61972eb..5bb4ad3ba 100644
--- a/src/i18n/messages/src/components/layout/AppLayout.json
+++ b/src/i18n/messages/src/components/layout/AppLayout.json
@@ -37,5 +37,18 @@
       "line": 36,
       "column": 3
     }
+  },
+  {
+    "id": "infobar.authRequestFailed",
+    "defaultMessage": "!!!There were errors while trying to perform an authenticated request. Please try logging out and back in if this error persists.",
+    "file": "src/components/layout/AppLayout.js",
+    "start": {
+      "line": 37,
+      "column": 21
+    },
+    "end": {
+      "line": 40,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/components/services/content/Services.json b/src/i18n/messages/src/components/services/content/Services.json
index 7fef6a4b2..fac438178 100644
--- a/src/i18n/messages/src/components/services/content/Services.json
+++ b/src/i18n/messages/src/components/services/content/Services.json
@@ -24,5 +24,31 @@
       "line": 18,
       "column": 3
     }
+  },
+  {
+    "id": "services.login",
+    "defaultMessage": "!!!Please login to use Ferdi.",
+    "file": "src/components/services/content/Services.js",
+    "start": {
+      "line": 19,
+      "column": 9
+    },
+    "end": {
+      "line": 22,
+      "column": 3
+    }
+  },
+  {
+    "id": "services.serverInfo",
+    "defaultMessage": "!!!Optionally, you can change your Ferdi server by clicking the cog in the bottom left corner.",
+    "file": "src/components/services/content/Services.js",
+    "start": {
+      "line": 23,
+      "column": 14
+    },
+    "end": {
+      "line": 26,
+      "column": 3
+    }
   }
 ]
\ No newline at end of file
diff --git a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
index b979b625c..7645ae2c2 100644
--- a/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
+++ b/src/i18n/messages/src/containers/settings/EditSettingsScreen.json
@@ -65,15 +65,28 @@
     }
   },
   {
+    "id": "settings.app.form.server",
+    "defaultMessage": "!!!Server",
+    "file": "src/containers/settings/EditSettingsScreen.js",
+    "start": {
+      "line": 44,
+      "column": 10
+    },
+    "end": {
+      "line": 47,
+      "column": 3
+    }
+  },
+  {
     "id": "settings.app.form.language",
     "defaultMessage": "!!!Language",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 44,
+      "line": 48,
       "column": 12
     },
     "end": {
-      "line": 47,
+      "line": 51,
       "column": 3
     }
   },
@@ -82,11 +95,11 @@
     "defaultMessage": "!!!Dark Mode",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 48,
+      "line": 52,
       "column": 12
     },
     "end": {
-      "line": 51,
+      "line": 55,
       "column": 3
     }
   },
@@ -95,11 +108,11 @@
     "defaultMessage": "!!!Display disabled services tabs",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 52,
+      "line": 56,
       "column": 24
     },
     "end": {
-      "line": 55,
+      "line": 59,
       "column": 3
     }
   },
@@ -108,11 +121,11 @@
     "defaultMessage": "!!!Show unread message badge when notifications are disabled",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 56,
+      "line": 60,
       "column": 29
     },
     "end": {
-      "line": 59,
+      "line": 63,
       "column": 3
     }
   },
@@ -121,11 +134,11 @@
     "defaultMessage": "!!!Enable spell checking",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 60,
+      "line": 64,
       "column": 23
     },
     "end": {
-      "line": 63,
+      "line": 67,
       "column": 3
     }
   },
@@ -134,11 +147,11 @@
     "defaultMessage": "!!!Enable GPU Acceleration",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 64,
+      "line": 68,
       "column": 25
     },
     "end": {
-      "line": 67,
+      "line": 71,
       "column": 3
     }
   },
@@ -147,11 +160,11 @@
     "defaultMessage": "!!!Include beta versions",
     "file": "src/containers/settings/EditSettingsScreen.js",
     "start": {
-      "line": 68,
+      "line": 72,
       "column": 8
     },
     "end": {
-      "line": 71,
+      "line": 75,
       "column": 3
     }
   }
diff --git a/src/theme/default/legacy.js b/src/theme/default/legacy.js
index 44496948d..46847c60b 100644
--- a/src/theme/default/legacy.js
+++ b/src/theme/default/legacy.js
@@ -5,9 +5,9 @@ export const themeBrandInfo = '#5bc0de';
 export const themeBrandWarning = '#FF9F00';
 export const themeBrandDanger = '#d9534f';
 
-export const themeGrayDark = '#7367F0';
-export const themeGray = '#7367F0';
-export const themeGrayLight = '#CE9FFC';
+export const themeGrayDark = '#373a3c';
+export const themeGray = '#55595c';
+export const themeGrayLight = '#818a91';
 export const themeGrayLighter = '#eceeef';
 export const themeGrayLightest = '#f7f7f9';