47 files changed, 127 insertions, 152 deletions

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index f7d10735c..48a83c5a1 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -203,7 +203,7 @@ export default @inject('stores', 'actions') @observer class Sidebar extends Comp
           <i className="mdi mdi-settings" />
           { (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE
             || this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED) && (
-            <span className="update-availible">
+            <span className="update-available">
               •
             </span>
           ) }
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 3a38d682b..7e6d93997 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -38,13 +38,13 @@ const messages = defineMessages({
     id: 'settings.team.upgradeAction',
     defaultMessage: '!!!Upgrade your Account',
   },
-  teamsUnavailible: {
-    id: 'settings.team.teamsUnavailible',
-    defaultMessage: '!!!Teams are unavailible',
+  teamsUnavailable: {
+    id: 'settings.team.teamsUnavailable',
+    defaultMessage: '!!!Teams are unavailable',
   },
-  teamsUnavailibleInfo: {
-    id: 'settings.team.teamsUnavailibleInfo',
-    defaultMessage: '!!!Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.',
+  teamsUnavailableInfo: {
+    id: 'settings.team.teamsUnavailableInfo',
+    defaultMessage: '!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.',
   },
 });
 
@@ -208,9 +208,9 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
         </div>
         <div className="settings__body">
           <h1 className={classes.headline}>
-            {intl.formatMessage(messages.teamsUnavailible)}
+            {intl.formatMessage(messages.teamsUnavailable)}
           </h1>
-          {intl.formatMessage(messages.teamsUnavailibleInfo)}
+          {intl.formatMessage(messages.teamsUnavailableInfo)}
         </div>
       </div>
     );
diff --git a/src/config.js b/src/config.js
index b1dbab1ff..e762f879f 100644
--- a/src/config.js
+++ b/src/config.js
@@ -116,7 +116,6 @@ export const LOCAL_SERVER = 'You are using Ferdi without a server';
 export const SETTINGS_PATH = path.join(app.getPath('userData'), 'config');
 
 // Replacing app.asar is not beautiful but unforunately necessary
-export const DICTIONARY_PATH = asarPath(path.join(__dirname, 'dictionaries'));
 export const RECIPES_PATH = asarPath(path.join(__dirname, 'recipes'));
 
 export const ALLOWED_PROTOCOLS = [
diff --git a/src/i18n/apply-branding.js b/src/i18n/apply-branding.js
index 1494ce923..316413edd 100644
--- a/src/i18n/apply-branding.js
+++ b/src/i18n/apply-branding.js
@@ -12,7 +12,7 @@ const ignore = [
   'login.customServerQuestion',
   'settings.app.todoServerInfo',
   'settings.app.serverMoneyInfo',
-  'settings.team.teamsUnavailibleInfo',
+  'settings.team.teamsUnavailableInfo',
 ];
 
 // Files to ignore when applying branding
diff --git a/src/i18n/locales/af.json b/src/i18n/locales/af.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/af.json
+++ b/src/i18n/locales/af.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/ar.json b/src/i18n/locales/ar.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/ar.json
+++ b/src/i18n/locales/ar.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/bs.json b/src/i18n/locales/bs.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/bs.json
+++ b/src/i18n/locales/bs.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/ca.json b/src/i18n/locales/ca.json
index 306c8e91d..41aaf37a3 100644
--- a/src/i18n/locales/ca.json
+++ b/src/i18n/locales/ca.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Equip",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Empresa",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/cs.json b/src/i18n/locales/cs.json
index cd458df49..7f9b29c8a 100644
--- a/src/i18n/locales/cs.json
+++ b/src/i18n/locales/cs.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Tým",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Společnost",
   "settings.user.form.accountType.individual": "Jednotlivec",
diff --git a/src/i18n/locales/da.json b/src/i18n/locales/da.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/da.json
+++ b/src/i18n/locales/da.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/de.json b/src/i18n/locales/de.json
index 1b7b5969a..aef231f05 100644
--- a/src/i18n/locales/de.json
+++ b/src/i18n/locales/de.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "Mit Ferdi für Teams kannst du Premium Lizenzen für Kolleginnen und Kollegen oder Freunde und Familienmitglieder kaufen und verwalten - so viele du willst.",
   "settings.team.manageAction": "Verwalte dein Team auf getferdi.com",
-  "settings.team.teamsUnavailible": "Teams sind nicht verfügbar",
-  "settings.team.teamsUnavailibleInfo": "Teams sind derzeit nur bei der Verwendung des Franz Servers und nach der Zahlung für Franz Professional verfügbar. \nBitte ändern Sie Ihren Server auf https://api.franzinfra.com, um Teams zu verwenden.",
+  "settings.team.teamsUnavailable": "Teams sind nicht verfügbar",
+  "settings.team.teamsUnavailableInfo": "Teams sind derzeit nur bei der Verwendung des Franz Servers und nach der Zahlung für Franz Professional verfügbar. \nBitte ändern Sie Ihren Server auf https://api.franzinfra.com, um Teams zu verwenden.",
   "settings.team.upgradeAction": "Account Upgrade durchführen",
   "settings.user.form.accountType.company": "Firma",
   "settings.user.form.accountType.individual": "Einzelperson",
diff --git a/src/i18n/locales/defaultMessages.json b/src/i18n/locales/defaultMessages.json
index c9f5ac50c..e188c1d23 100644
--- a/src/i18n/locales/defaultMessages.json
+++ b/src/i18n/locales/defaultMessages.json
@@ -3083,26 +3083,26 @@
         }
       },
       {
-        "defaultMessage": "!!!Teams are unavailible",
+        "defaultMessage": "!!!Teams are unavailable",
         "end": {
           "column": 3,
           "line": 44
         },
         "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.teamsUnavailible",
+        "id": "settings.team.teamsUnavailable",
         "start": {
           "column": 20,
           "line": 41
         }
       },
       {
-        "defaultMessage": "!!!Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+        "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
         "end": {
           "column": 3,
           "line": 48
         },
         "file": "src/components/settings/team/TeamDashboard.js",
-        "id": "settings.team.teamsUnavailibleInfo",
+        "id": "settings.team.teamsUnavailableInfo",
         "start": {
           "column": 24,
           "line": 45
diff --git a/src/i18n/locales/el.json b/src/i18n/locales/el.json
index bba3e7c6d..af4b990ec 100644
--- a/src/i18n/locales/el.json
+++ b/src/i18n/locales/el.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Ομάδα",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Εταιρεία",
   "settings.user.form.accountType.individual": "Ατομικός",
diff --git a/src/i18n/locales/en-US.json b/src/i18n/locales/en-US.json
index 10f0b7c6f..c809dc021 100644
--- a/src/i18n/locales/en-US.json
+++ b/src/i18n/locales/en-US.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/es.json b/src/i18n/locales/es.json
index 56462cdcd..86a2256f0 100644
--- a/src/i18n/locales/es.json
+++ b/src/i18n/locales/es.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Equipo",
   "settings.team.intro": "¿Usted y su equipo usan a Ferdi? Ahora puede administrar las suscripciones Premium para tantos colegas, amigos o familiares como desee, todo desde una misma cuenta.",
   "settings.team.manageAction": "Gestione su equipo en getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Actualiza tu cuenta",
   "settings.user.form.accountType.company": "Empresa",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/fi.json b/src/i18n/locales/fi.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/fi.json
+++ b/src/i18n/locales/fi.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/fr.json b/src/i18n/locales/fr.json
index 4026ead28..594a009aa 100644
--- a/src/i18n/locales/fr.json
+++ b/src/i18n/locales/fr.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Équipe",
   "settings.team.intro": "Vous et votre équipes utilise Ferdi? Tu peux désormais gérer les abonnements Premium pour autant de collègues, amis ou membres de famille que tu souhaites, à partir d'un seul et même compte.",
   "settings.team.manageAction": "Gère ton équipe sur getferdi.com",
-  "settings.team.teamsUnavailible": "Les équipes sont indisponibles",
-  "settings.team.teamsUnavailibleInfo": "Les équipes sont actuellement disponibles uniquement lorsque vous utilisez le serveur de Franz et après avoir payé pour Franz Professionnel. Veuillez changer votre serveur à https://api.franzinfra.com pour utiliser des équipes.",
+  "settings.team.teamsUnavailable": "Les équipes sont indisponibles",
+  "settings.team.teamsUnavailableInfo": "Les équipes sont actuellement disponibles uniquement lorsque vous utilisez le serveur de Franz et après avoir payé pour Franz Professionnel. Veuillez changer votre serveur à https://api.franzinfra.com pour utiliser des équipes.",
   "settings.team.upgradeAction": "Améliorez votre compte",
   "settings.user.form.accountType.company": "Entreprise",
   "settings.user.form.accountType.individual": "Individuel",
diff --git a/src/i18n/locales/ga.json b/src/i18n/locales/ga.json
index 8903b2e30..aa86fe6d1 100644
--- a/src/i18n/locales/ga.json
+++ b/src/i18n/locales/ga.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Foireann",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Comhlacht",
   "settings.user.form.accountType.individual": "Ar leith",
diff --git a/src/i18n/locales/he.json b/src/i18n/locales/he.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/he.json
+++ b/src/i18n/locales/he.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/hr.json b/src/i18n/locales/hr.json
index e2dc5e4b4..a0d5bc659 100644
--- a/src/i18n/locales/hr.json
+++ b/src/i18n/locales/hr.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Tim",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Tvrtka",
   "settings.user.form.accountType.individual": "Pojedinac",
diff --git a/src/i18n/locales/hu.json b/src/i18n/locales/hu.json
index 0338cb98a..cce492d56 100644
--- a/src/i18n/locales/hu.json
+++ b/src/i18n/locales/hu.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Csapat",
   "settings.team.intro": "Te és a csapatod Ferdi-ot használtok? Egy fiókból kezelheted kollégáid, barátaid vagy családtagjaid Prémium előfizetéseit.",
   "settings.team.manageAction": "Csapat kezelése a getferdi.com-on",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Előfizetés",
   "settings.user.form.accountType.company": "Cég",
   "settings.user.form.accountType.individual": "Egyén",
diff --git a/src/i18n/locales/id.json b/src/i18n/locales/id.json
index 9059f0985..aa1cc6463 100644
--- a/src/i18n/locales/id.json
+++ b/src/i18n/locales/id.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Tim",
   "settings.team.intro": "Anda dan tim Anda menggunakan Ferdi? Kini Anda bisa mengelola langganan Premium untuk semua rekan kerja, teman, atau anggota keluar sebanyak yang Anda inginkan, semuanya cukup dari satu akun.",
   "settings.team.manageAction": "Kelola Tim Anda di getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Tingkatkan Akun Anda",
   "settings.user.form.accountType.company": "Perusahaan",
   "settings.user.form.accountType.individual": "Pribadi",
diff --git a/src/i18n/locales/it.json b/src/i18n/locales/it.json
index 9e9b0484d..d6f6549da 100644
--- a/src/i18n/locales/it.json
+++ b/src/i18n/locales/it.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Gruppo",
   "settings.team.intro": "Tu e il tuo team usate Ferdi? Ora puoi gestire le sottoscrizioni Premium per tutti i colleghi, amici e famigliari che vuoi, tutto da un singolo account.",
   "settings.team.manageAction": "Gestisci il tuo Team su getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Aggiorna il tuo Account",
   "settings.user.form.accountType.company": "Società",
   "settings.user.form.accountType.individual": "Individuale",
diff --git a/src/i18n/locales/ja.json b/src/i18n/locales/ja.json
index 79eb90db2..afda9ca1c 100644
--- a/src/i18n/locales/ja.json
+++ b/src/i18n/locales/ja.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "チーム",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "法人",
   "settings.user.form.accountType.individual": "個人",
diff --git a/src/i18n/locales/ka.json b/src/i18n/locales/ka.json
index 024af8c9b..3878f8eeb 100644
--- a/src/i18n/locales/ka.json
+++ b/src/i18n/locales/ka.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "გუნდი",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "კომპანია",
   "settings.user.form.accountType.individual": "ინდივიდუალური",
diff --git a/src/i18n/locales/ko.json b/src/i18n/locales/ko.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/ko.json
+++ b/src/i18n/locales/ko.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index a88168e4a..1176d0f00 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "Gebruiken jij en je team Ferdi? Je kunt nu Premium inschrijvingen beheren voor zoveel collega's, vrienden, of familieleden als je wilt, allemaal vanaf één account.",
   "settings.team.manageAction": "Beheer je Team op getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade je Account",
   "settings.user.form.accountType.company": "Bedrijf",
   "settings.user.form.accountType.individual": "Particulier",
diff --git a/src/i18n/locales/nl.json b/src/i18n/locales/nl.json
index 538df2fb8..dab8545c9 100644
--- a/src/i18n/locales/nl.json
+++ b/src/i18n/locales/nl.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "Gebruiken jij en je team Ferdi? Je kunt nu Premium inschrijvingen beheren voor zoveel collega's, vrienden, of familieleden als je wilt. En dat alles vanuit één account.",
   "settings.team.manageAction": "Beheer je Team op getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Jouw Account opwaarderen",
   "settings.user.form.accountType.company": "Bedrijf",
   "settings.user.form.accountType.individual": "Individueel",
diff --git a/src/i18n/locales/no.json b/src/i18n/locales/no.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/no.json
+++ b/src/i18n/locales/no.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/pl.json b/src/i18n/locales/pl.json
index fe65f73b8..85dde2229 100644
--- a/src/i18n/locales/pl.json
+++ b/src/i18n/locales/pl.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Zespół",
   "settings.team.intro": "Czy Ty i zesół używacie programu Ferdi? Możesz teraz zarządzać subskrypcją Premium dla tylu kolegów, przyjaciół lub rodziny ilu chcesz, wszystko w obrębie jednego konta.",
   "settings.team.manageAction": "Zarządzaj zespołem na getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Ulepsz swoje konto",
   "settings.user.form.accountType.company": "Firma",
   "settings.user.form.accountType.individual": "Prywatne",
diff --git a/src/i18n/locales/pt-BR.json b/src/i18n/locales/pt-BR.json
index 91c1fbc37..0b8a51750 100644
--- a/src/i18n/locales/pt-BR.json
+++ b/src/i18n/locales/pt-BR.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Equipe",
   "settings.team.intro": "Você e sua equipe usam Ferdi? Você pode agora administrar as inscrições pagas de todos os seus colegas, amigos e membros da família que você quiser, tudo isso em uma única conta.",
   "settings.team.manageAction": "Gerencie sua Equipe no getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Atualize a sua conta para versão paga",
   "settings.user.form.accountType.company": "Empresa",
   "settings.user.form.accountType.individual": "Pessoal",
diff --git a/src/i18n/locales/pt.json b/src/i18n/locales/pt.json
index 2237cc059..8948f223a 100644
--- a/src/i18n/locales/pt.json
+++ b/src/i18n/locales/pt.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Equipa",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Gerir a tua Equipa em getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Actualiza a tua conta",
   "settings.user.form.accountType.company": "Empresa",
   "settings.user.form.accountType.individual": "Indivíduo",
diff --git a/src/i18n/locales/ro.json b/src/i18n/locales/ro.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/ro.json
+++ b/src/i18n/locales/ro.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index 58fa12b60..557cf0de6 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Команда",
   "settings.team.intro": "Вы и ваша команда испльзуете Ferdi? Вы теперь можете управлять Премиум подписками любого количества коллег, друзей и членов семьи, из одного и того же аккаунта.",
   "settings.team.manageAction": "Управляйте вашей Командой на getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Улучшить ваш аккаунт",
   "settings.user.form.accountType.company": "Компания",
   "settings.user.form.accountType.individual": "Индивидуальный",
diff --git a/src/i18n/locales/sk.json b/src/i18n/locales/sk.json
index ca4410a56..398f4c85a 100644
--- a/src/i18n/locales/sk.json
+++ b/src/i18n/locales/sk.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Tím",
   "settings.team.intro": "Vy a váš tím používate Ferdi? Teraz môžete spravovať prémiové predplatné pre toľko kolegov, priateľov alebo rodinných príslušníkov, koľko chcete, všetko z jedného účtu.",
   "settings.team.manageAction": "Spravujte svoj tím na adrese getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Vylepšite svoj účet",
   "settings.user.form.accountType.company": "Spoločnosť",
   "settings.user.form.accountType.individual": "Osoba",
diff --git a/src/i18n/locales/sl.json b/src/i18n/locales/sl.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/sl.json
+++ b/src/i18n/locales/sl.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index 4aacd6d6e..8493077bb 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Tim",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Tvrtka",
   "settings.user.form.accountType.individual": "Pojedinac",
diff --git a/src/i18n/locales/sv.json b/src/i18n/locales/sv.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/sv.json
+++ b/src/i18n/locales/sv.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/tr.json b/src/i18n/locales/tr.json
index c9beabaf9..734e8a2dd 100644
--- a/src/i18n/locales/tr.json
+++ b/src/i18n/locales/tr.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Takım",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "getferdi.com adresinden Ekibini yönet",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Kurum",
   "settings.user.form.accountType.individual": "Bireysel",
diff --git a/src/i18n/locales/uk.json b/src/i18n/locales/uk.json
index 7cbfdc3a3..d0525983f 100644
--- a/src/i18n/locales/uk.json
+++ b/src/i18n/locales/uk.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Команда",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Компанія",
   "settings.user.form.accountType.individual": "Індивідуальний",
diff --git a/src/i18n/locales/vi.json b/src/i18n/locales/vi.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/vi.json
+++ b/src/i18n/locales/vi.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/locales/zh-Hant.json b/src/i18n/locales/zh-Hant.json
index c64830574..678554c05 100644
--- a/src/i18n/locales/zh-Hant.json
+++ b/src/i18n/locales/zh-Hant.json
@@ -54,7 +54,6 @@
   "locked.invalidCredentials": "Password invalid",
   "locked.password.label": "Password",
   "locked.submit.label": "Unlock",
-  "login.changeServer": "Change server",
   "login.customServerQuestion": "Using a custom Ferdi server?",
   "login.customServerSuggestion": "Try importing your Franz account",
   "login.email.label": "電子郵件信箱",
@@ -187,7 +186,6 @@
   "services.getStarted": "開始使用",
   "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.",
-  "services.serverless": "Use Ferdi without an Account",
   "services.welcome": "歡迎使用 Ferdi",
   "settings.account.account.editButton": "更改帳戶資訊",
   "settings.account.accountType.basic": "基本帳戶",
@@ -356,8 +354,6 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "公司",
   "settings.user.form.accountType.individual": "個人",
diff --git a/src/i18n/locales/zh.json b/src/i18n/locales/zh.json
index f60644ab3..2e3034367 100644
--- a/src/i18n/locales/zh.json
+++ b/src/i18n/locales/zh.json
@@ -356,8 +356,8 @@
   "settings.team.headline": "Team",
   "settings.team.intro": "You and your team use Ferdi? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
   "settings.team.manageAction": "Manage your Team on getferdi.com",
-  "settings.team.teamsUnavailible": "Teams are unavailible",
-  "settings.team.teamsUnavailibleInfo": "Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+  "settings.team.teamsUnavailable": "Teams are unavailable",
+  "settings.team.teamsUnavailableInfo": "Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
   "settings.team.upgradeAction": "Upgrade your Account",
   "settings.user.form.accountType.company": "Company",
   "settings.user.form.accountType.individual": "Individual",
diff --git a/src/i18n/messages/src/components/settings/team/TeamDashboard.json b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
index 64693933c..bbf362087 100644
--- a/src/i18n/messages/src/components/settings/team/TeamDashboard.json
+++ b/src/i18n/messages/src/components/settings/team/TeamDashboard.json
@@ -78,8 +78,8 @@
     }
   },
   {
-    "id": "settings.team.teamsUnavailible",
-    "defaultMessage": "!!!Teams are unavailible",
+    "id": "settings.team.teamsUnavailable",
+    "defaultMessage": "!!!Teams are unavailable",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
       "line": 41,
@@ -91,8 +91,8 @@
     }
   },
   {
-    "id": "settings.team.teamsUnavailibleInfo",
-    "defaultMessage": "!!!Teams are currently only availible when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
+    "id": "settings.team.teamsUnavailableInfo",
+    "defaultMessage": "!!!Teams are currently only available when using the Franz Server and after paying for Franz Professional. Please change your server to https://api.franzinfra.com to use teams.",
     "file": "src/components/settings/team/TeamDashboard.js",
     "start": {
       "line": 45,
diff --git a/src/index.js b/src/index.js
index 4d7215d5e..6b7790e2f 100644
--- a/src/index.js
+++ b/src/index.js
@@ -9,12 +9,11 @@ import fs from 'fs-extra';
 import path from 'path';
 import windowStateKeeper from 'electron-window-state';
 
-// Set app directory before loading user modules
-if (process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR) {
-  const appDataPath = process.env.FERDI_APPDATA_DIR || process.env.PORTABLE_EXECUTABLE_DIR;
-  app.setPath('appData', appDataPath);
-  app.setPath('userData', path.join(app.getPath('appData'), app.getName()));
+if (process.platform === "win32") {
+  app.setPath("appData", process.env.LOCALAPPDATA);
+  app.setPath("userData", path.join(process.env.LOCALAPPDATA, app.getName()));
 }
+
 if (isDevMode) {
   app.setPath('userData', path.join(app.getPath('appData'), `${app.getName()}Dev`));
 }
diff --git a/src/styles/layout.scss b/src/styles/layout.scss
index a7de4b247..c09d69f6c 100644
--- a/src/styles/layout.scss
+++ b/src/styles/layout.scss
@@ -39,7 +39,7 @@ html { overflow: hidden; }
         color: $theme-brand-primary;
       }
 
-      .update-availible { 
+      .update-available { 
         align-items: center;
         background: $theme-brand-danger;
         border-radius: 20px;
diff --git a/src/webview/spellchecker.js b/src/webview/spellchecker.js
index 1cb449110..47fc6dcd1 100644
--- a/src/webview/spellchecker.js
+++ b/src/webview/spellchecker.js
@@ -1,36 +1,21 @@
 import { webFrame } from 'electron';
-import { attachSpellCheckProvider, SpellCheckerProvider } from 'electron-hunspell';
-import path from 'path';
-import { readFileSync } from 'fs';
+import { SpellCheckHandler, ContextMenuListener, ContextMenuBuilder } from 'electron-spellchecker';
 
-import { DICTIONARY_PATH } from '../config';
 import { SPELLCHECKER_LOCALES } from '../i18n/languages';
 
-const debug = require('debug')('Ferdi:spellchecker');
+const debug = require('debug')('Franz:spellchecker');
 
-let provider;
+let handler;
 let currentDict;
+let contextMenuBuilder;
 let _isEnabled = false;
-let attached;
 
-const DEFAULT_LOCALE = 'en-us';
-
-async function loadDictionary(locale) {
-  try {
-    const fileLocation = path.join(DICTIONARY_PATH, `hunspell-dict-${locale}/${locale}`);
-    debug('Loaded dictionary', locale, 'from', fileLocation);
-    return provider.loadDictionary(locale, readFileSync(`${fileLocation}.dic`), readFileSync(`${fileLocation}.aff`));
-  } catch (err) {
-    console.error('Could not load dictionary', err);
-  }
-}
-
-export async function switchDict(locale = DEFAULT_LOCALE) {
+export async function switchDict(locale) {
   try {
     debug('Trying to load dictionary', locale);
 
-    if (!provider) {
-      console.warn('SpellcheckProvider not initialized');
+    if (!handler) {
+      console.warn('SpellcheckHandler not initialized');
 
       return;
     }
@@ -41,11 +26,7 @@ export async function switchDict(locale = DEFAULT_LOCALE) {
       return;
     }
 
-    if (currentDict) {
-      provider.unloadDictionary(locale);
-    }
-    await loadDictionary(locale);
-    await attached.switchLanguage(locale);
+    handler.switchLanguage(locale);
 
     debug('Switched dictionary to', locale);
 
@@ -56,34 +37,23 @@ export async function switchDict(locale = DEFAULT_LOCALE) {
   }
 }
 
-export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
-  const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
-
-  if (locales.length >= 1) {
-    return locales[0];
-  }
-
-  return null;
-}
-
-export default async function initialize(languageCode = DEFAULT_LOCALE) {
+export default async function initialize(languageCode = 'en-us') {
   try {
-    provider = new SpellCheckerProvider();
-    const locale = getSpellcheckerLocaleByFuzzyIdentifier(languageCode);
+    handler = new SpellCheckHandler();
+    handler.attachToInput();
+    const locale = languageCode.toLowerCase();
 
     debug('Init spellchecker');
-    await provider.initialize();
-
-    debug('Attaching spellcheck provider');
-    attached = await attachSpellCheckProvider(provider);
-
-    const availableDictionaries = await provider.getAvailableDictionaries();
 
-    debug('Available spellchecker dictionaries', availableDictionaries);
+    switchDict(locale);
 
-    await switchDict(locale);
+    contextMenuBuilder = new ContextMenuBuilder(handler);
+    // eslint-disable-next-line no-new
+    new ContextMenuListener((info) => {
+      contextMenuBuilder.showPopupMenu(info);
+    });
 
-    return provider;
+    return handler;
   } catch (err) {
     console.error(err);
     return false;
@@ -96,8 +66,19 @@ export function isEnabled() {
 
 export function disable() {
   if (isEnabled()) {
+    handler.unsubscribe();
     webFrame.setSpellCheckProvider(currentDict, { spellCheck: () => true });
     _isEnabled = false;
     currentDict = null;
   }
 }
+
+export function getSpellcheckerLocaleByFuzzyIdentifier(identifier) {
+  const locales = Object.keys(SPELLCHECKER_LOCALES).filter(key => key === identifier.toLowerCase() || key.split('-')[0] === identifier.toLowerCase());
+
+  if (locales.length >= 1) {
+    return locales[0];
+  }
+
+  return null;
+}